u

loculus-project · Jan 18, 2024 · f921f50 · f921f50
1 parent 7c9c177
commit f921f50
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 25 deletions.
diff --git a/kubernetes/loculus/templates/_common-metadata.tpl b/kubernetes/loculus/templates/_common-metadata.tpl
@@ -28,7 +28,7 @@ fields:
 {{- define "loculus.generateWebsiteConfig" }}
 {{- $commonMetadata := (include "loculus.commonMetadata" . | fromYaml).fields }}
 instances:
-  {{- range $key, $instance := .instances }}
+  {{- range $key, $instance := $.Values.instances }}
   {{ $key }}:
     schema:
       {{- with $instance.schema }}
@@ -65,7 +65,7 @@ fields:
 {{/* Generate backend config from passed config object */}}
 {{- define "loculus.generateBackendConfig" }}
 instances:
-  {{- range $key, $instance := .instances }}
+  {{- range $key, $instance := $.Values.instances }}
   {{ $key }}:
     schema:
       {{- with $instance.schema }}

diff --git a/kubernetes/loculus/templates/lapis-ingress.yaml b/kubernetes/loculus/templates/lapis-ingress.yaml
@@ -1,6 +1,5 @@
 {{- $lapisHost := printf "lapis.%s" .Values.host }}
-{{- $config := $.Values.configYaml }}
-{{- range $key, $_ := $config.instances }}
+{{- range $key, $_ := $.instances }}
 
 ---
 apiVersion: traefik.containo.us/v1alpha1

diff --git a/kubernetes/loculus/templates/lapis-service.yaml b/kubernetes/loculus/templates/lapis-service.yaml
@@ -1,6 +1,4 @@
-{{- $config := $.Values.configYaml }}
-
-{{- range $key, $_ := $config.instances }}
+{{- range $key, $_ := $.Values.instances }}
 ---
 apiVersion: v1
 kind: Service

diff --git a/kubernetes/loculus/templates/lapis-silo-database-config.yaml b/kubernetes/loculus/templates/lapis-silo-database-config.yaml
@@ -1,8 +1,7 @@
-{{- $config := $.Values.configYaml }}
 {{- $commonMetadata := (include "loculus.commonMetadata" . | fromYaml).fields }}
 {{- $importScriptLines := .Files.Lines "silo_import_job.sh" }}
 
-{{- range $key, $instance := $config.instances }}
+{{- range $key, $instance := $.Values.instances }}
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/kubernetes/loculus/templates/lapis-silo-deployment.yaml b/kubernetes/loculus/templates/lapis-silo-deployment.yaml
@@ -1,6 +1,4 @@
-{{- $config := $.Values.configYaml }}
-
-{{- range $key, $_ := $config.instances }}
+{{- range $key, $_ := $.Values.instances }}
 ---
 apiVersion: apps/v1
 kind: Deployment

diff --git a/kubernetes/loculus/templates/lapis-silo-import-cronjob.yaml b/kubernetes/loculus/templates/lapis-silo-import-cronjob.yaml
@@ -1,9 +1,7 @@
-{{- $config := $.Values.configYaml }}
-
 {{- $keycloakTokenUrl := "http://loculus-keycloak-service:8083/realms/loculusRealm/protocol/openid-connect/token" }}
 
 
-{{- range $key, $_ := $config.instances }}
+{{- range $key, $_ := $.Values.instances }}
 ---
 apiVersion: batch/v1
 kind: CronJob

diff --git a/kubernetes/loculus/templates/lapis-silo-shared-data.yaml b/kubernetes/loculus/templates/lapis-silo-shared-data.yaml
@@ -1,6 +1,4 @@
-{{- $config := $.Values.configYaml }}
-
-{{- range $key, $_ := $config.instances }}
+{{- range $key, $_ := $.Values.instances }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim

diff --git a/kubernetes/loculus/templates/loculus-backend-config.yaml b/kubernetes/loculus/templates/loculus-backend-config.yaml
@@ -6,4 +6,4 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   backend_config.json: |
-    {{ $.Values.configYaml | include "loculus.generateBackendConfig" | fromYaml | toJson }}
+    {{ include "loculus.generateBackendConfig" . | fromYaml | toJson }}
diff --git a/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml b/kubernetes/loculus/templates/loculus-preprocessing-deployment.yaml
@@ -1,5 +1,4 @@
 {{- $dockerTag := include "loculus.dockerTag" .Values }}
-{{ $config := $.Values.configYaml }}
 {{ $backendHost := .Values.disableBackend | ternary
     "http://host.k3d.internal:8079"
     "http://loculus-backend-service:8079"
@@ -28,7 +27,7 @@ spec:
         component: loculus-preprocessing
     spec:
       containers:
-        {{- range $key, $_ := $config.instances }}
+        {{- range $key, $_ := $.Values.instances }}
         - name: preprocessing-{{ $key }}
           image: ghcr.io/loculus-project/preprocessing-dummy:{{ $dockerTag }}
           imagePullPolicy: Always

diff --git a/kubernetes/loculus/templates/loculus-website-config.yaml b/kubernetes/loculus/templates/loculus-website-config.yaml
@@ -1,13 +1,12 @@
 {{- $keycloakHost := printf "authentication.%s" .Values.host }}
-{{- $config := $.Values.configYaml }}
 {{- $lapisHost := (
   eq .Values.environment "server" | ternary
     (printf "https://lapis.%s" .Values.host)
     "http://localhost:8080"
 ) }}
 {{- $externalLapisUrlConfig := dict
   "host" $lapisHost
-  "config" $config
+  "config" $.Values
 }}
 
 ---
@@ -18,7 +17,7 @@ metadata:
   namespace: {{ .Values.namespace }}
 data:
   website_config.json: |
-    {{ $config | include "loculus.generateWebsiteConfig" | fromYaml | toJson }}
+    {{ include "loculus.generateWebsiteConfig" . | fromYaml | toJson }}
 
   runtime_config.json: |
     {
@@ -28,7 +27,7 @@ data:
             {{- else }}
             "backendUrl": "http://localhost:8079",
             {{- end }}
-            "lapisUrls": {{- include "loculus.generateInternalLapisUrls" $config | fromYaml | toJson }},
+            "lapisUrls": {{- include "loculus.generateInternalLapisUrls" . | fromYaml | toJson }},
             "keycloakUrl": "http://loculus-keycloak-service:8083"
         },
         "public": {