Refactor pgstacBootstrap to support additional environment variables and update values.yaml to use a map for extraEnvVars

Author: emmanuelmathot

helm-chart/eoapi/templates/pgstacboostrap/job.yaml

@@ -80,8 +80,9 @@ spec:
               value: {{ .Values.pgstacBootstrap.settings.envVars.LOAD_FIXTURES | quote }}
             - name: KEEP_ALIVE
               value: {{ .Values.pgstacBootstrap.settings.envVars.KEEP_ALIVE | quote }}
-          {{- with .Values.pgstacBootstrap.settings.extraEnvVars }}
-            {{- toYaml . | nindent 12 }}
+          {{- range $key, $value := .Values.pgstacBootstrap.settings.extraEnvVars }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote }}
           {{- end }}
           # TODO (emmanuel): to be removed when we have a generic way to
           # inject secrets in the pod

helm-chart/eoapi/templates/services/deployment.yaml

@@ -87,10 +87,16 @@ spec:
           - containerPort: {{ $.Values.service.port }}
         resources:
           {{- toYaml (index $v "settings" "resources") | nindent 10 }}
-        {{- if $.Values.postgrescluster.enabled }}
         env:
+          - name: DUMMY_ENV_VAR
+            value: 1
+        {{- if $.Values.postgrescluster.enabled }}
           {{- include "eoapi.pgstacSecrets" $ | nindent 12 }}
         {{- end }}
+        {{- range $key, $value := .Values.pgstacBootstrap.settings.extraEnvVars }}
+          - name: {{ $key | quote }}
+            value: {{ $value | quote }}
+        {{- end }}
         envFrom:
           # NOTE: there's no reason we need to use a `ConfigMap` or `Secret` here to get os env vars into the pod.
           # we could just template them out here immediately with `value: $_` but this allows us

helm-chart/eoapi/values.yaml

@@ -181,7 +181,7 @@ pgstacBootstrap:
       # toggle to `true` if you want to keep the job running as db jumpbox
       KEEP_ALIVE: "false"
     # extra env vars to set in the pgstacBootstrap pod
-    extraEnvVars: []
+    extraEnvVars: {}
     # extra env var from mounts to set in the pgstacBootstrap pod
     extraEnvFrom: []
     # extra volumes to mount in the pgstacBootstrap pod
@@ -269,7 +269,7 @@ raster:
       # https://www.uvicorn.org/settings/#production
       WEB_CONCURRENCY: "5"
     # Additional environment variables
-    extraEnvVars: []
+    extraEnvVars: {}
 
 multidim:
   enabled: false # disabled by default
@@ -340,7 +340,7 @@ multidim:
       # https://www.uvicorn.org/settings/#production
       WEB_CONCURRENCY: "5"
     # Additional environment variables
-    extraEnvVars: []
+    extraEnvVars: {}
 
 stac:
   enabled: true
@@ -400,7 +400,7 @@ stac:
       WEB_CONCURRENCY: "5"
       DB_MIN_CONN_SIZE: "1"
     # Additional environment variables
-    extraEnvVars: []
+    extraEnvVars: {}
 
 vector:
   enabled: true
@@ -464,7 +464,7 @@ vector:
       # https://www.uvicorn.org/settings/#production
       WEB_CONCURRENCY: "5"
     # Additional environment variables
-    extraEnvVars: []
+    extraEnvVars: {}
 
 docServer:
   enabled: true