Refactor pgstacBootstrap job configuration to use extraEnvFrom and extraEnvVars for environment variable management in job.yaml and values.yaml

Author: emmanuelmathot

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

@@ -28,7 +28,7 @@ spec:
             {{- with .Values.pgstacBootstrap.settings.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
-          {{- if .Values.pgstacBootstrap.settings.envFrom }}
+          {{- if .Values.pgstacBootstrap.settings.extraEnvFrom }}
           envFrom:
             {{- with .Values.pgstacBootstrap.settings.extraEnvFrom }}
             {{- toYaml . | nindent 12 }}
@@ -39,8 +39,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

values.yaml

@@ -18,7 +18,7 @@ stac:
   settings:
     labels:
       azure.workload.identity/use: "true"
-    envVars:
+    extraEnvVars:
       FORWARDED_ALLOW_IPS: "*"
       PROXY_HEADERS: True
       POSTGRES_USER: postgres
@@ -63,7 +63,7 @@ pgstacBootstrap:
   settings:
     labels:
       azure.workload.identity/use: "true"
-    envVars:
+    extraEnvVars:
       POSTGRES_USER: postgres
       POSTGRES_PORT: 5432
 postgrescluster: