Commit 52530e4a authored by Günter Hipler's avatar Günter Hipler
Browse files

modifications before trying to release first helm release

parent 3d3634e2
Pipeline #31152 passed with stages
in 5 minutes and 1 second
...@@ -124,9 +124,9 @@ class ElasticsearchClient @Inject()( ...@@ -124,9 +124,9 @@ class ElasticsearchClient @Inject()(
hosts += new HttpHost(value, configuredPort) hosts += new HttpHost(value, configuredPort)
} }
) )
val headers = Array(new BasicHeader("cluster.name", getEnv("ELASTIC_CLUSTERNAME")) //val headers = Array(new BasicHeader("cluster.name", getEnv("ELASTIC_CLUSTERNAME"))
.asInstanceOf[Header]) // .asInstanceOf[Header])
Option(new RestHighLevelClient(RestClient.builder(hosts.toArray : _*).setDefaultHeaders(headers))) Option(new RestHighLevelClient(RestClient.builder(hosts.toArray : _*)))
} }
private def getEnv(value: String): String = { private def getEnv(value: String): String = {
......
include "oaiconfigmap/oai.conf" include "oaiconfigmap/oai.conf"
include "secureconfigmap/secure.conf" include "secureconfigmap/secure.conf"
#include "oai" #include "oai.conf"
#include "secure" #include "secure.conf"
play { play {
......
...@@ -2,16 +2,18 @@ tag: "latest" ...@@ -2,16 +2,18 @@ tag: "latest"
k8sEnvironment: prod k8sEnvironment: prod
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: placeholder # TODO: Set requests
k8sRequestsMemory: placeholder # TODO: Set requests k8sRequestsCpu: "0.5" # TODO: Set requests
k8sLimitsCpu: placeholder # TODO: Set limits k8sRequestsMemory: "512Mi" # TODO: Set requests
k8sLimitsMemory: placeholder # TODO: Set limits k8sLimitsCpu: "0.7" # TODO: Set limits
k8sHost: oai.memobase.k8s.unibas.ch k8sLimitsMemory: "768Mi" # TODO: Set limits
k8sHost: oai.memobase.ch
k8sPort: 9000 k8sPort: 9000
elasticHostConfigs: prod-elastic-configs elasticHostConfigs: prod-elastic-configs
elasticIndex: "oai-v9" elasticIndex: prod-edm-index
elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
responseListlength: "30" responseListlength: "30"
resumptionTokenTtl: "3" resumptionTokenTtl: "3"
...@@ -2,16 +2,17 @@ tag: "latest" ...@@ -2,16 +2,17 @@ tag: "latest"
k8sEnvironment: stage k8sEnvironment: stage
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: placeholder # TODO: Set requests
k8sRequestsMemory: placeholder # TODO: Set requests k8sRequestsCpu: "0.5" # TODO: Set requests
k8sLimitsCpu: placeholder # TODO: Set limits k8sRequestsMemory: "512Mi" # TODO: Set requests
k8sLimitsMemory: placeholder # TODO: Set limits k8sLimitsCpu: "0.7" # TODO: Set limits
k8sLimitsMemory: "768Mi" # TODO: Set limits
k8sHost: oai-stage.memobase.k8s.unibas.ch k8sHost: oai-stage.memobase.k8s.unibas.ch
k8sPort: 9000 k8sPort: 9000
elasticHostConfigs: stage-elastic-configs elasticHostConfigs: stage-elastic-configs
elasticIndex: "oai-v9" # TODO: Set correct stage index name elasticIndex: stage-edm-index
elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
responseListlength: "30" responseListlength: "30"
resumptionTokenTtl: "3" resumptionTokenTtl: "3"
...@@ -2,16 +2,18 @@ tag: "latest" ...@@ -2,16 +2,18 @@ tag: "latest"
k8sEnvironment: test k8sEnvironment: test
k8sReplicas: 1 k8sReplicas: 1
k8sRequestsCpu: placeholder # TODO: Set requests
k8sRequestsMemory: placeholder # TODO: Set requests k8sRequestsCpu: "0.5" # TODO: Set requests
k8sLimitsCpu: placeholder # TODO: Set limits k8sRequestsMemory: "512Mi" # TODO: Set requests
k8sLimitsMemory: placeholder # TODO: Set limits k8sLimitsCpu: "0.7" # TODO: Set limits
k8sLimitsMemory: "768Mi" # TODO: Set limits
k8sHost: oai-test.memobase.k8s.unibas.ch k8sHost: oai-test.memobase.k8s.unibas.ch
k8sPort: 9000 k8sPort: 9000
elasticHostConfigs: test-elastic-configs elasticHostConfigs: test-elastic-configs
elasticIndex: "oai-v9" # TODO: Set correct test index name elasticIndex: test-edm-index
elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
responseListlength: "30" responseListlength: "30"
resumptionTokenTtl: "3" resumptionTokenTtl: "3"
...@@ -5,6 +5,5 @@ metadata: ...@@ -5,6 +5,5 @@ metadata:
namespace: "{{ .Values.k8sNamespace }}" namespace: "{{ .Values.k8sNamespace }}"
data: data:
ELASTIC_INDEX: "{{ .Values.elasticIndex }}" ELASTIC_INDEX: "{{ .Values.elasticIndex }}"
ELASTIC_CLUSTERNAME: "{{ .Values.elasticClustername }}"
RESPONSE_LISTLENGTH: "{{ .Values.responseListlength }}" RESPONSE_LISTLENGTH: "{{ .Values.responseListlength }}"
RESUMPTION_TOKEN_TTL: "{{ .Values.resumptionTokenTtl }}" RESUMPTION_TOKEN_TTL: "{{ .Values.resumptionTokenTtl }}"
...@@ -17,7 +17,6 @@ k8sPort: placeholder ...@@ -17,7 +17,6 @@ k8sPort: placeholder
elasticHostConfigs: placeholder elasticHostConfigs: placeholder
elasticIndex: placeholder elasticIndex: placeholder
elasticClustername: placeholder # TODO: Is this still needed?
responseListlength: placeholder responseListlength: placeholder
resumptionTokenTtl: placeholder resumptionTokenTtl: placeholder
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment