feat: support scheduling fields in kruise helmHooks and kruise-game

versions/kruise-game/next/templates/manager.yaml

@@ -119,3 +119,15 @@ spec:
                 path: config.toml
             name: kruise-game-manager-config
           name: provider-config
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

versions/kruise-game/next/values.yaml

@@ -28,6 +28,12 @@ serviceAccount:
   # Annotations to add to the service account
   annotations: {}
 
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
 service:
   port: 8443
 

versions/kruise-rollout/next/templates/manager.yaml

@@ -96,6 +96,10 @@ spec:
                         - {{ .Values.rollout.fullname }}
                 topologyKey: kubernetes.io/hostname
               weight: 100
+        {{- with .Values.nodeAffinity }}
+        nodeAffinity:
+          {{- toYaml . | nindent 10 }}
+        {{- end }}
       topologySpreadConstraints:
       - labelSelector:
           matchLabels:
@@ -107,7 +111,11 @@ spec:
         maxSkew: 1
         topologyKey: topology.kubernetes.io/zone
         whenUnsatisfiable:  ScheduleAnyway
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
-      {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}

versions/kruise-rollout/next/values.yaml

@@ -60,7 +60,11 @@ resources:
   #   cpu: 100m
   #   memory: 128Mi
 
-tolerations:
+nodeAffinity: {}
+
+nodeSelector: {}
+
+tolerations: []
 # Toleration represents the toleration object that can be attached to a pod.
 # The pod this Toleration is attached to tolerates any taint that matches
 # the triple <key,value,effect> using the matching operator <operator>.

versions/kruise/next/templates/pre_delete_hook_job.yaml

@@ -79,6 +79,18 @@ spec:
         - name: pre-delete-job
           image: {{ .Values.helmHooks.image.repository }}:{{ .Values.helmHooks.image.tag }}
           imagePullPolicy: IfNotPresent
+      {{- with .Values.helmHooks.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.helmHooks.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.helmHooks.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 ---
 # write a service account named kruise-helm-hook:
 apiVersion: v1

versions/kruise/next/values.yaml

@@ -118,3 +118,6 @@ helmHooks:
   image:
     repository: openkruise/kruise-helm-hook
     tag: v0.1.0
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}