add affinity to jobTemplate

charts/vald-helm-operator/crds/valdrelease.yaml

@@ -8406,6 +8406,51 @@ spec:
                         corrector:
                           type: object
                           properties:
+                            affinity:
+                              type: object
+                              properties:
+                                nodeAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: object
+                                      properties:
+                                        nodeSelectorTerms:
+                                          type: array
+                                          items:
+                                            type: object
+                                            x-kubernetes-preserve-unknown-fields: true
+                                podAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                podAntiAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
                             agent_namespace:
                               type: string
                             discoverer:
@@ -9037,6 +9082,9 @@ spec:
                               type: string
                             node_name:
                               type: string
+                            nodeSelector:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
                             observability:
                               type: object
                               properties:
@@ -9714,6 +9762,11 @@ spec:
                               minimum: 1
                             suspend:
                               type: boolean
+                            tolerations:
+                              type: array
+                              items:
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
                             ttlSecondsAfterFinished:
                               type: integer
                             version:
@@ -9722,6 +9775,51 @@ spec:
                         creator:
                           type: object
                           properties:
+                            affinity:
+                              type: object
+                              properties:
+                                nodeAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: object
+                                      properties:
+                                        nodeSelectorTerms:
+                                          type: array
+                                          items:
+                                            type: object
+                                            x-kubernetes-preserve-unknown-fields: true
+                                podAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                podAntiAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
                             agent_namespace:
                               type: string
                             concurrency:
@@ -10157,6 +10255,9 @@ spec:
                               type: string
                             node_name:
                               type: string
+                            nodeSelector:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
                             observability:
                               type: object
                               properties:
@@ -10835,6 +10936,11 @@ spec:
                               type: array
                               items:
                                 type: string
+                            tolerations:
+                              type: array
+                              items:
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
                             ttlSecondsAfterFinished:
                               type: integer
                             version:
@@ -13012,6 +13118,51 @@ spec:
                         saver:
                           type: object
                           properties:
+                            affinity:
+                              type: object
+                              properties:
+                                nodeAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: object
+                                      properties:
+                                        nodeSelectorTerms:
+                                          type: array
+                                          items:
+                                            type: object
+                                            x-kubernetes-preserve-unknown-fields: true
+                                podAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                podAntiAffinity:
+                                  type: object
+                                  properties:
+                                    preferredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
+                                    requiredDuringSchedulingIgnoredDuringExecution:
+                                      type: array
+                                      items:
+                                        type: object
+                                        x-kubernetes-preserve-unknown-fields: true
                             agent_namespace:
                               type: string
                             concurrency:
@@ -13445,6 +13596,9 @@ spec:
                               type: string
                             node_name:
                               type: string
+                            nodeSelector:
+                              type: object
+                              x-kubernetes-preserve-unknown-fields: true
                             observability:
                               type: object
                               properties:
@@ -14123,6 +14277,11 @@ spec:
                               type: array
                               items:
                                 type: string
+                            tolerations:
+                              type: array
+                              items:
+                                type: object
+                                x-kubernetes-preserve-unknown-fields: true
                             ttlSecondsAfterFinished:
                               type: integer
                             version:

charts/vald/templates/_helpers.tpl

@@ -896,6 +896,10 @@ spec:
           {{- toYaml .Job.securityContext | nindent 12 }}
         {{- end }}
       {{- end }}
+      {{- if .Job.affinity }}
+      affinity:
+        {{- include "vald.affinity" .Job.affinity | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Job.name }}
           image: "{{ .Job.image.repository }}:{{ default .default.Values.defaults.image.tag .Job.image.tag }}"
@@ -929,6 +933,14 @@ spec:
           configMap:
             defaultMode: 420
             name: {{ .Job.name }}-config
+      {{- if .Job.nodeSelector }}
+      nodeSelector:
+        {{- toYaml .Job.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Job.tolerations }}
+      tolerations:
+        {{- toYaml .Job.tolerations | nindent 8 }}
+      {{- end }}
       {{- if .Job.serviceAccount }}
       serviceAccountName: {{ .Job.serviceAccount.name }}
       {{- end }}