upgrade helm charts

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

 k8sEnvironment: prod
 k8sReplicas: 1
 
-k8sRequestsCpu: "0.5"
+k8sRequestsCpu: "0.1"
 k8sRequestsMemory: "512Mi"
 k8sLimitsCpu: "0.7"
 k8sLimitsMemory: "768Mi"
 
 
-k8sHost: oai-prod.memobase.k8s.unibas.ch
+k8sHost: oai.memobase.ch
+k8sHostInternal: oai.memobase.k8s.unibas.ch
 k8sPort: 9000
 
 elasticHostConfigs: prod-elastic-configs

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

 k8sEnvironment: stage
 k8sReplicas: 1
 
-k8sRequestsCpu: "0.5"
+k8sRequestsCpu: "0.1"
 k8sRequestsMemory: "512Mi"
 k8sLimitsCpu: "0.7"
 k8sLimitsMemory: "768Mi"
 
-k8sHost: oai-stage.memobase.k8s.unibas.ch
+k8sHost: stage.oai.memobase.ch
+k8sHostInternal: stage.oai.memobase.k8s.unibas.ch
 k8sPort: 9000
 
 elasticHostConfigs: prod-elastic-configs

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

 k8sEnvironment: test
 k8sReplicas: 1
 
-k8sRequestsCpu: "0.5"
+k8sRequestsCpu: "0.1"
 k8sRequestsMemory: "512Mi"
 k8sLimitsCpu: "0.7"
 k8sLimitsMemory: "768Mi"
 
 
-k8sHost: oai-test.memobase.k8s.unibas.ch
+k8sHost: test.oai.memobase.ch
+k8sHostInternal: test.oai.memobase.k8s.unibas.ch
 k8sPort: 9000
 
 elasticHostConfigs: test-elastic-configs

helm-charts/stage-oai.conf

@@ -45,7 +45,7 @@ oaiconfigs: {
   ]
   identify: {
     repositoryName: "memobase OAI repositories"
-    baseURL: "https://oai.memobase.ch"
+    baseURL: "https://stage.oai.memobase.ch"
     protocolVersion: "2.0"
     adminEmail: "admin@memobase.ch"
     earliestDatestamp: "2021-01-01T00:00:00.000Z"

helm-charts/templates/ingress.yaml

@@ -15,6 +15,7 @@ spec:
   tls:
     - hosts:
         - "{{ .Values.k8sHost }}"
+        - "{{ .Values.k8sHostInternal }}"
       secretName: "{{ .Values.k8sHost }}-tls"
   rules:
     - host: "{{ .Values.k8sHost }}"
@@ -27,3 +28,13 @@ spec:
                 name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
                 port:
                   number: {{ .Values.k8sPort }}
+    - host: "{{ .Values.k8sHostInternal }}"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
+                port:
+                  number: {{ .Values.k8sPort }}

helm-charts/test-oai.conf

@@ -45,7 +45,7 @@ oaiconfigs: {
   ]
   identify: {
     repositoryName: "memobase OAI repositories"
-    baseURL: "https://oai.memobase.ch"
+    baseURL: "https://test.oai.memobase.ch"
     protocolVersion: "2.0"
     adminEmail: "admin@memobase.ch"
     earliestDatestamp: "2021-01-01T00:00:00.000Z"

helm-charts/values.yaml

@@ -13,6 +13,7 @@ k8sRequestsMemory: placeholder
 k8sLimitsCpu: placeholder
 k8sLimitsMemory: placeholder
 k8sHost: placeholder
+k8sHostInternal: placeholder
 k8sPort: placeholder
 
 elasticHostConfigs: placeholder
@@ -22,4 +23,4 @@ responseListlength: placeholder
 resumptionTokenTtl: placeholder
 
 oaiConfPath: "/app/conf/oaiconfigmap"
-secoreConfPath: "/app/conf/secureconfigmap"
\ No newline at end of file
+secoreConfPath: "/app/conf/secureconfigmap"