feat(helm): support global image registry and node selectors

Author: Gentleelephant

deploy/helm/fluid/charts/fluid/templates/_helpers.tpl

@@ -69,6 +69,10 @@ Create the name of the service account to use
   {{- $imageTag := index . 2 -}}
   {{- $root := index . 3 -}}
 
+  {{- if $root.Values.global.imageRegistry -}}
+    {{- $imagePrefix = $root.Values.global.imageRegistry -}}
+  {{- end -}}
+
   {{- /* If any value is empty, return an error message */ -}}
   {{- if or (empty $imagePrefix) (empty $imageName) (empty $imageTag) -}}
     {{- fail "Error: imagePrefix, imageName, and imageTag must all be defined and non-empty." -}}
@@ -84,6 +88,10 @@ Create the name of the service account to use
   {{- $imageTag := index . 2 -}}
   {{- $root := index . 3 -}}
 
+  {{- if $root.Values.global.imageRegistry -}}
+    {{- $imagePrefix = $root.Values.global.imageRegistry -}}
+  {{- end -}}
+
   {{- /* If any value is empty, return an error message */ -}}
   {{- if or (empty $imagePrefix) (empty $imageName) (empty $imageTag) -}}
     {{- fail "Error: imagePrefix, imageName, and imageTag must all be defined and non-empty." -}}
@@ -161,3 +169,11 @@ Check if feature gate DataflowAffinity is enabled in the featureGates.
 {{- end -}}
 {{- $found -}}
 {{- end -}}
+
+{{- define "common.nodeSelectors" -}}
+{{- $selector := default .Values.global.nodeSelector .Values.nodeSelector }}
+{{- if $selector }}
+      nodeSelector:
+{{ toYaml $selector | indent 8 }}
+{{- end }}
+{{- end }}

deploy/helm/fluid/charts/fluid/templates/controller/alluxioruntime_controller.yaml

@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.runtime.alluxio.tolerations | indent 6}}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.alluxio.controller.imagePrefix .Values.runtime.alluxio.controller.imageName .Values.runtime.alluxio.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/dataset_controller.yaml

@@ -33,6 +33,7 @@ spec:
 {{ toYaml .Values.dataset.tolerations | indent 6}}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.dataset.controller.imagePrefix .Values.dataset.controller.imageName .Values.dataset.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/efcruntime_controller.yaml

@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.runtime.efc.tolerations | indent 6 }}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.efc.controller.imagePrefix .Values.runtime.efc.controller.imageName .Values.runtime.efc.controller.imageTag . ) }}
         imagePullPolicy: {{ .Values.runtime.efc.controller.imagePullPolicy }}

deploy/helm/fluid/charts/fluid/templates/controller/fluidapp_controller.yaml

@@ -31,6 +31,7 @@ spec:
 {{ toYaml .Values.fluidapp.tolerations | indent 6 }}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.fluidapp.controller.imagePrefix .Values.fluidapp.controller.imageName .Values.fluidapp.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/goosefsruntime_controller.yaml

@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.runtime.goosefs.tolerations | indent 6 }}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.goosefs.controller.imagePrefix .Values.runtime.goosefs.controller.imageName .Values.runtime.goosefs.controller.imageTag . ) }}
         imagePullPolicy: Always

deploy/helm/fluid/charts/fluid/templates/controller/jindoruntime_controller.yaml

@@ -34,6 +34,7 @@ spec:
       tolerations:
 {{ toYaml .Values.runtime.jindo.tolerations | indent 6 }}
       {{- end }}
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.jindo.controller.imagePrefix .Values.runtime.jindo.controller.imageName .Values.runtime.jindo.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/juicefsruntime_controller.yaml

@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.runtime.juicefs.tolerations | indent 6 }}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.juicefs.controller.imagePrefix .Values.runtime.juicefs.controller.imageName .Values.runtime.juicefs.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/thinruntime_controller.yaml

@@ -35,6 +35,7 @@ spec:
 {{ toYaml .Values.runtime.thin.tolerations | indent 6 }}
       {{- end }}
       #hostNetwork: true
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.thin.controller.imagePrefix .Values.runtime.thin.controller.imageName .Values.runtime.thin.controller.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/templates/controller/vineyardruntime_controller.yaml

@@ -34,6 +34,7 @@ spec:
       tolerations:
 {{ toYaml .Values.runtime.vineyard.tolerations | indent 6 }}
       {{- end }}
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.vineyard.controller.imagePrefix .Values.runtime.vineyard.controller.imageName .Values.runtime.vineyard.controller.imageTag . ) }}
         name: manager