default image & node selector for jobs

joy2fun · Jun 17, 2024 · 440e5c9 · 440e5c9
1 parent 354acb5
commit 440e5c9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/templates/cron.yaml b/app/templates/cron.yaml
@@ -12,7 +12,7 @@ spec:
         spec:
           restartPolicy: Never
           containers:
-            - image: {{ $.Values.cron.image }}
+            - image: {{ $.Values.cron.image | default "bitnami/kubectl:latest" }}
               imagePullPolicy: IfNotPresent
               env:
                 - name: KUBERNETES_SERVICE_HOST
@@ -25,6 +25,10 @@ spec:
                 - -c
                 - {{ .command }}
           serviceAccountName: {{ $.Values.cron.serviceAccountName }}
+          {{- with $.Values.cron.nodeSelector }}
+          nodeSelector:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
   schedule: "{{ .schedule }}"
 {{- end }}
 {{- end }}
diff --git a/app/templates/task.yaml b/app/templates/task.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         {{- range $index, $task := .Values.tasks.commands }}
         - name: task-{{ $index }}-{{ $task.name }}
-          image: {{ .Values.tasks.image }}
+          image: {{ $.Values.tasks.image | default "bitnami/kubectl:latest" }}
           imagePullPolicy: IfNotPresent
           resources:
             limits:
@@ -33,4 +33,8 @@ spec:
             - while true; do {{ $task.command }}; sleep {{ $task.sleep | default 10 }} ; done
         {{- end }}
       serviceAccountName: {{ .Values.tasks.serviceAccountName }}
+      {{- with .Values.tasks.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/app/values.yaml b/app/values.yaml
@@ -52,6 +52,7 @@ cron:
   enabled: false
   serviceAccountName: job
   image: bitnami/kubectl:latest
+  nodeSelector: {}
   jobs: 
     - schedule: "* * * * *"
       name: "job"
@@ -61,6 +62,7 @@ tasks:
   enabled: false
   serviceAccountName: job
   image: bitnami/kubectl:latest
+  nodeSelector: {}
   commands:
     - name: whoami
       sleep: 10