Merge pull request #117 from codecademy-engineering/lindsay-jobs-envs

add env options to jobs
codecademy-engineering · Mar 21, 2024 · 251cd8b · 251cd8b
2 parents 45a3c6d + def4023
commit 251cd8b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.8.14
+version: 1.8.15
 maintainers:
   - email: [email protected]
     name: devops
diff --git a/charts/service/ci/custom-values.yaml b/charts/service/ci/custom-values.yaml
@@ -129,7 +129,7 @@ jobs:
     image: alpine
     tag: '3.16'
     command: ['echo', 'FOOBAR']
-    useParentEnv: false
+    useParentEnv: true
     resources:
       requests:
         cpu: 10m

diff --git a/charts/service/templates/jobs.yaml b/charts/service/templates/jobs.yaml
@@ -3,6 +3,8 @@
 {{- $imagePullPolicy := .Values.image.pullPolicy -}}
 {{- $datadog := .Values.datadog -}}
 {{- $securityContext := .Values.securityContext -}}
+{{- $parentEnvKeyValue := .Values.envKeyValue -}}
+{{- $parentEnv := .Values.env -}}
 {{- range .Values.jobs }}
 ---
 apiVersion: batch/v1
@@ -31,6 +33,15 @@ spec:
           command:
             {{- toYaml .command | nindent 12 }}
           env:
+            {{- if .useParentEnv }}
+            {{- range $key, $value := $parentEnvKeyValue }}
+            - name: {{ $key }}
+              value: "{{ $value }}"
+            {{- end }}
+            {{- with $parentEnv }}
+              {{- toYaml . | nindent 12 }}
+            {{- end }}
+            {{- end }}
             {{- with .env }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
@@ -54,6 +65,11 @@ spec:
                   fieldPath: metadata.labels['tags.datadoghq.com/version']
             {{- end }}
             {{- end }}
+          {{- if .envFromSecret }}
+          envFrom:
+            - secretRef:
+                name: {{ .envFromSecret }}
+          {{- end }}
           resources:
             {{- toYaml .resources | nindent 12 }}
           securityContext: