fix: make nonsensitive env var injection work (#22)

chanzuckerberg · May 22, 2024 · 9ffd57b · 9ffd57b
1 parent 197edd7
commit 9ffd57b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/stack/templates/_helpers.tpl b/stack/templates/_helpers.tpl
@@ -84,15 +84,6 @@ Create the name of the service account to use
 {{- end }}
 
 {{- define "service.configuration" -}}
-
-{{- if .Values.env }}
-env:
-{{- range $i, $value := .Values.env }}
-- name: {{ $value.name }}
-  value: {{ $value.value }}
-{{- end }}
-{{- end }}
-
 {{- if or (or (or (ne (trim .Values.appSecrets.envSecret.secretName) "") (ne (trim .Values.appSecrets.envSecret.secretName) "")) (ne (trim .Values.appContext.envContextConfigMapName) "")) (ne (trim .Values.appContext.stackContextConfigMapName) "") -}}
 envFrom:
 {{- if ne (trim .Values.appSecrets.envSecret.secretName) "" }}
@@ -116,4 +107,16 @@ envFrom:
     optional: true
 {{- end }}
 {{- end }}
+{{- end }}
+
+{{- define "service.nonsensitiveEnvVars" -}}
+{{- if .Values.env }}
+env:
+{{- range $i, $value := .Values.env }}
+- name: {{ $value.name }}
+  value: {{ $value.value }}
+{{- end }}
+{{- else }}
+env: []
+{{- end }}
 {{- end }}
diff --git a/stack/templates/deployment.yaml b/stack/templates/deployment.yaml
@@ -75,6 +75,11 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           {{- include "service.configuration" . | nindent 10}}
+          {{- $env := concat $global.Values.global.env (fromYaml (include "service.nonsensitiveEnvVars" .)).env }}
+          {{- if $env }}
+          env:
+            {{- toYaml (uniq $env) | nindent 12}}
+          {{- end }}
         {{- range $i, $container := .Values.sidecars }}
         {{- with omit $container "envFrom" }}
         - {{- toYaml . | nindent 10 }}