Merge pull request #116 from codecademy-engineering/lindsay-job-images

add ability to add custom image to job
codecademy-engineering · Feb 7, 2024 · 3db1f74 · 3db1f74
2 parents 60dc52a + 77bb6a3
commit 3db1f74
Show file tree

Hide file tree

Showing 3 changed files with 20 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.12
+version: 1.8.13
 maintainers:
   - email: [email protected]
     name: devops
diff --git a/charts/service/ci/custom-values.yaml b/charts/service/ci/custom-values.yaml
@@ -125,6 +125,24 @@ jobs:
       - name: test-job
         emptyDir: {}
     ttlSecondsAfterFinished: 30
+  - name: bar
+    image: alpine
+    tag: '3.16'
+    command: ['echo', 'FOOBAR']
+    useParentEnv: false
+    resources:
+      requests:
+        cpu: 10m
+        memory: 50Mi
+      limits:
+        cpu: 10m
+        memory: 50Mi
+    volumeMounts:
+      - name: test-job
+        mountPath: /tmp/
+    volumes:
+      - name: test-job
+        emptyDir: {}
 
 hostAliases:
   - ip: 0.0.0.0

diff --git a/charts/service/templates/jobs.yaml b/charts/service/templates/jobs.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
         - name: {{ .name }}
-          image: "{{ $image }}:{{ $tag }}"
+          image: "{{ .image | default $image }}:{{ .tag | default $tag }}"
           imagePullPolicy: {{ $imagePullPolicy }}
           command:
             {{- toYaml .command | nindent 12 }}