Improving Affinity Config for Jobs

kool-dev · Feb 7, 2022 · 09c0d3a · 09c0d3a
1 parent 7521b0e
commit 09c0d3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/charts/generic/templates/cronjobs.yaml b/charts/generic/templates/cronjobs.yaml
@@ -114,13 +114,13 @@ spec:
               {{- end }}
             {{- end }}
           {{- end }}
-          {{- with $.Values.nodeSelector }}
+          {{- with $cronjob.nodeSelector | default $.Values.nodeSelector }}
           nodeSelector: {{ toYaml . | nindent 12 }}
           {{- end }}
-          {{- with $.Values.affinity }}
+          {{- with $cronjob.affinity | default $.Values.affinity }}
           affinity: {{ toYaml . | nindent 12 }}
           {{- end }}
-          {{- with $.Values.tolerations }}
+          {{- with $cronjob.tolerations | default $.Values.tolerations }}
           tolerations: {{ toYaml . | nindent 12 }}
           {{- end }}
 ---

diff --git a/charts/generic/templates/jobs.yaml b/charts/generic/templates/jobs.yaml
@@ -123,14 +123,14 @@ spec:
           {{- end }}
         {{- end }}
       {{- end }}
-      {{- with $.Values.nodeSelector }}
-      nodeSelector: {{ toYaml . | nindent 8 }}
+      {{- with $job.nodeSelector | default $.Values.nodeSelector }}
+      nodeSelector: {{ toYaml . | nindent 12 }}
       {{- end }}
-      {{- with $.Values.affinity }}
-      affinity: {{ toYaml . | nindent 8 }}
+      {{- with $job.affinity | default $.Values.affinity }}
+      affinity: {{ toYaml . | nindent 12 }}
       {{- end }}
-      {{- with $.Values.tolerations }}
-      tolerations: {{ toYaml . | nindent 8 }}
+      {{- with $job.tolerations | default $.Values.tolerations }}
+      tolerations: {{ toYaml . | nindent 12 }}
       {{- end }}
 ---
 {{- end }}