modifications before trying to release first helm release

app/modules/ElasticsearchClient.scala

@@ -124,9 +124,9 @@ class ElasticsearchClient @Inject()(
         hosts += new HttpHost(value, configuredPort)
       }
     )
-    val headers = Array(new BasicHeader("cluster.name", getEnv("ELASTIC_CLUSTERNAME"))
-      .asInstanceOf[Header])
-    Option(new RestHighLevelClient(RestClient.builder(hosts.toArray : _*).setDefaultHeaders(headers)))
+    //val headers = Array(new BasicHeader("cluster.name", getEnv("ELASTIC_CLUSTERNAME"))
+    //  .asInstanceOf[Header])
+    Option(new RestHighLevelClient(RestClient.builder(hosts.toArray : _*)))
   }
 
   private def getEnv(value: String): String = {

conf/application.conf

 include "oaiconfigmap/oai.conf"
 include "secureconfigmap/secure.conf"
-#include "oai"
-#include "secure"
+#include "oai.conf"
+#include "secure.conf"
 
 
 play {

helm-charts/helm-values/api-oai-prod.yaml

@@ -2,16 +2,18 @@ tag: "latest"
 
 k8sEnvironment: prod
 k8sReplicas: 1
-k8sRequestsCpu: placeholder # TODO: Set requests
-k8sRequestsMemory: placeholder # TODO: Set requests
-k8sLimitsCpu: placeholder # TODO: Set limits
-k8sLimitsMemory: placeholder # TODO: Set limits
-k8sHost: oai.memobase.k8s.unibas.ch
+
+k8sRequestsCpu: "0.5" # TODO: Set requests
+k8sRequestsMemory: "512Mi" # TODO: Set requests
+k8sLimitsCpu: "0.7" # TODO: Set limits
+k8sLimitsMemory: "768Mi" # TODO: Set limits
+
+
+k8sHost: oai.memobase.ch
 k8sPort: 9000
 
 elasticHostConfigs: prod-elastic-configs
-elasticIndex: "oai-v9"
-elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
+elasticIndex: prod-edm-index
 
 responseListlength: "30"
 resumptionTokenTtl: "3"

helm-charts/helm-values/api-oai-stage.yaml

@@ -2,16 +2,17 @@ tag: "latest"
 
 k8sEnvironment: stage
 k8sReplicas: 1
-k8sRequestsCpu: placeholder # TODO: Set requests
-k8sRequestsMemory: placeholder # TODO: Set requests
-k8sLimitsCpu: placeholder # TODO: Set limits
-k8sLimitsMemory: placeholder # TODO: Set limits
+
+k8sRequestsCpu: "0.5" # TODO: Set requests
+k8sRequestsMemory: "512Mi" # TODO: Set requests
+k8sLimitsCpu: "0.7" # TODO: Set limits
+k8sLimitsMemory: "768Mi" # TODO: Set limits
+
 k8sHost: oai-stage.memobase.k8s.unibas.ch
 k8sPort: 9000
 
 elasticHostConfigs: stage-elastic-configs
-elasticIndex: "oai-v9" # TODO: Set correct stage index name
-elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
+elasticIndex: stage-edm-index
 
 responseListlength: "30"
 resumptionTokenTtl: "3"

helm-charts/helm-values/api-oai-test.yaml

@@ -2,16 +2,18 @@ tag: "latest"
 
 k8sEnvironment: test
 k8sReplicas: 1
-k8sRequestsCpu: placeholder # TODO: Set requests
-k8sRequestsMemory: placeholder # TODO: Set requests
-k8sLimitsCpu: placeholder # TODO: Set limits
-k8sLimitsMemory: placeholder # TODO: Set limits
+
+k8sRequestsCpu: "0.5" # TODO: Set requests
+k8sRequestsMemory: "512Mi" # TODO: Set requests
+k8sLimitsCpu: "0.7" # TODO: Set limits
+k8sLimitsMemory: "768Mi" # TODO: Set limits
+
+
 k8sHost: oai-test.memobase.k8s.unibas.ch
 k8sPort: 9000
 
 elasticHostConfigs: test-elastic-configs
-elasticIndex: "oai-v9" # TODO: Set correct test index name
-elasticClustername: "test-memobase-search-cluster" # TODO: Is this still needed?
+elasticIndex: test-edm-index
 
 responseListlength: "30"
 resumptionTokenTtl: "3"

helm-charts/templates/app-config.yaml

@@ -5,6 +5,5 @@ metadata:
   namespace: "{{ .Values.k8sNamespace }}"
 data:
   ELASTIC_INDEX: "{{ .Values.elasticIndex }}"
-  ELASTIC_CLUSTERNAME: "{{ .Values.elasticClustername }}"
   RESPONSE_LISTLENGTH: "{{ .Values.responseListlength }}"
   RESUMPTION_TOKEN_TTL: "{{ .Values.resumptionTokenTtl }}"

helm-charts/values.yaml

@@ -17,7 +17,6 @@ k8sPort: placeholder
 
 elasticHostConfigs: placeholder
 elasticIndex: placeholder
-elasticClustername: placeholder # TODO: Is this still needed?
 
 responseListlength: placeholder
 resumptionTokenTtl: placeholder