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

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

deploy/helm/fluid/charts/fluid/templates/csi/daemonset.yaml

@@ -24,6 +24,7 @@ spec:
 {{ toYaml .Values.csi.tolerations | indent 6 }}
       {{- end }}
       #priorityClassName: system-node-critical
+      {{- include "common.nodeSelectors" .}}
       {{- if .Values.csi.config.hostNetwork }}
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet

deploy/helm/fluid/charts/fluid/templates/webhook/webhook.yaml

@@ -26,6 +26,7 @@ spec:
       {{- end }}
       serviceAccountName: fluid-webhook
       {{ include "fluid.controlplane.affinity" . | nindent 6}}
+      {{- include "common.nodeSelectors" .}}
       containers:
       - image: {{ include "fluid.controlplane.imageTransform" (list .Values.webhook.imagePrefix .Values.webhook.imageName .Values.webhook.imageTag . ) }}
         name: manager

deploy/helm/fluid/charts/fluid/values.yaml

@@ -4,24 +4,24 @@
 
 workdir: /tmp
 
-# Change the helm backend storage driver used by Fluid's controllers. 
+# Change the helm backend storage driver used by Fluid's controllers.
 # For now, only "configmap" and "secret" are supported.
 helmDriver: configmap
 
 image:
   imagePullSecrets: []
 
 # Default registry, namespace and version tag for images managed by fluid
-imagePrefix: &defaultImagePrefix fluidcloudnative
+imagePrefix: &defaultImagePrefix docker.io
 # imagePrefix: &defaultImagePrefix registry.aliyuncs.com/fluid
 version: &defaultVersion v1.0.5-7e917c7
 
 crdUpgrade:
   enabled: true
   # This sets the time-to-live (TTL) for crd-upgrade jobs. Default is 259200 seconds (3 days).
-  ttlSecondsAfterFinished: 259200 
+  ttlSecondsAfterFinished: 259200
   imagePrefix: *defaultImagePrefix
-  imageName: fluid-crd-upgrader
+  imageName: fluidcloudnative/fluid-crd-upgrader
   imageTag: *defaultVersion
 
 ##  if unspecified, will use built-in variable `.Release.Namespace`.
@@ -41,7 +41,7 @@ dataset:
   #     memory: 512Mi
   controller:
     imagePrefix: *defaultImagePrefix
-    imageName: dataset-controller
+    imageName: fluidcloudnative/dataset-controller
     imageTag: *defaultVersion
 
 csi:
@@ -52,11 +52,11 @@ csi:
     hostNetwork: true
   registrar:
     imagePrefix: *defaultImagePrefix
-    imageName: csi-node-driver-registrar
+    imageName: fluidcloudnative/csi-node-driver-registrar
     imageTag: v2.3.0
   plugins:
     imagePrefix: *defaultImagePrefix
-    imageName: fluid-csi
+    imageName: fluidcloudnative/fluid-csi
     imageTag: *defaultVersion
   # Whether or not to borrow kubelet's config file to use node authorization to restrict CSI Plugin's permission
   # See why Fluid's CSI Plugins need node-specific authorization at https://github.com/fluid-cloudnative/fluid/security/advisories/GHSA-93xx-cvmc-9w3v
@@ -95,19 +95,19 @@ runtime:
     enabled: false
     init:
       imagePrefix: *defaultImagePrefix
-      imageName: init-users
+      imageName: fluidcloudnative/init-users
       imageTag: v0.9.0
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: alluxioruntime-controller
+      imageName: fluidcloudnative/alluxioruntime-controller
       imageTag: *defaultVersion
     runtime:
-      imagePrefix: alluxio
-      imageName: alluxio-dev
+      imagePrefix: *defaultImagePrefix
+      imageName: alluxio/alluxio-dev
       imageTag: 2.9.0
     fuse:
-      imagePrefix: alluxio
-      imageName: alluxio-dev
+      imagePrefix: *defaultImagePrefix
+      imageName: alluxio/alluxio-dev
       imageTag: 2.9.0
     mountConfigStorage: configmap
   jindo:
@@ -129,22 +129,22 @@ runtime:
     engine: jindocache
     queryUfsTotal: true
     smartdata:
-      imagePrefix: registry.cn-shanghai.aliyuncs.com/jindofs
-      imageName: smartdata
+      imagePrefix: "registry.cn-shanghai.aliyuncs.com"
+      imageName: jindofs/smartdata
       imageTag: 6.2.0
     fuse:
-      imagePrefix: registry.cn-shanghai.aliyuncs.com/jindofs
-      imageName: jindo-fuse
+      imagePrefix: "registry.cn-shanghai.aliyuncs.com"
+      imageName: jindofs/jindo-fuse
       imageTag: 6.2.0
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: jindoruntime-controller
+      imageName: fluidcloudnative/jindoruntime-controller
       imageTag: *defaultVersion
     init:
       portCheck:
         enabled: false
       imagePrefix: *defaultImagePrefix
-      imageName: init-users
+      imageName: fluidcloudnative/init-users
       imageTag: v0.9.0
   goosefs:
     replicas: 1
@@ -164,19 +164,19 @@ runtime:
     enabled: false
     init:
       imagePrefix: *defaultImagePrefix
-      imageName: init-users
+      imageName: fluidcloudnative/init-users
       imageTag: v0.9.0
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: goosefsruntime-controller
+      imageName: fluidcloudnative/goosefsruntime-controller
       imageTag: *defaultVersion
     runtime:
-      imagePrefix: ccr.ccs.tencentyun.com/qcloud
-      imageName: goosefs
+      imagePrefix: "ccr.ccs.tencentyun.com"
+      imageName: qcloud/goosefs
       imageTag: v1.2.0
     fuse:
-      imagePrefix: ccr.ccs.tencentyun.com/qcloud
-      imageName: goosefs-fuse
+      imagePrefix: "ccr.ccs.tencentyun.com"
+      imageName: qcloud/goosefs-fuse
       imageTag: v1.2.0
   juicefs:
     replicas: 1
@@ -194,14 +194,14 @@ runtime:
     runtimeWorkers: 3
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: juicefsruntime-controller
+      imageName: fluidcloudnative/juicefsruntime-controller
       imageTag: *defaultVersion
     fuse:
-      ceimagePrefix: juicedata
-      ceimageName: mount
+      ceimagePrefix: *defaultImagePrefix
+      ceimageName: juicedata/mount
       ceimageTag: ce-v1.2.0
-      eeimagePrefix: juicedata
-      eeimageName: mount
+      eeimagePrefix: *defaultImagePrefix
+      eeimageName: juicedata/mount
       eeimageTag: ee-5.0.21-317356c
   thin:
     replicas: 1
@@ -219,7 +219,7 @@ runtime:
     runtimeWorkers: 3
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: thinruntime-controller
+      imageName: fluidcloudnative/thinruntime-controller
       imageTag: *defaultVersion
     fuse:
       configStorage: configmap
@@ -238,24 +238,24 @@ runtime:
     enabled: false
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: efcruntime-controller
+      imageName: fluidcloudnative/efcruntime-controller
       imageTag: *defaultVersion
       imagePullPolicy: Always
     init:
-      imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache
-      imageName: init-alifuse
+      imagePrefix: "registry.cn-zhangjiakou.aliyuncs.com"
+      imageName: nascache/init-alifuse
       imageTag: v1.2.2-19dcee9
     master:
-      imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache
-      imageName: efc-master
+      imagePrefix: "registry.cn-zhangjiakou.aliyuncs.com"
+      imageName: nascache/efc-master
       imageTag: v1.2.2-19dcee9
     worker:
-      imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache
-      imageName: efc-worker
+      imagePrefix: "registry.cn-zhangjiakou.aliyuncs.com"
+      imageName: nascache/efc-worker
       imageTag: v1.2.2-19dcee9
     fuse:
-      imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache
-      imageName: efc-fuse
+      imagePrefix: "registry.cn-zhangjiakou.aliyuncs.com"
+      imageName: nascache/efc-fuse
       imageTag: v1.2.2-19dcee9
   vineyard:
     replicas: 1
@@ -273,26 +273,26 @@ runtime:
     enabled: false
     controller:
       imagePrefix: *defaultImagePrefix
-      imageName: vineyardruntime-controller
+      imageName: fluidcloudnative/vineyardruntime-controller
       imageTag: *defaultVersion
       imagePullPolicy: Always
     master:
-      imagePrefix: registry.aliyuncs.com/vineyard
-      imageName: vineyardd
+      imagePrefix: "registry.aliyuncs.com"
+      imageName: vineyard/vineyardd
       imageTag: v0.22.2
     worker:
-      imagePrefix: registry.aliyuncs.com/vineyard
-      imageName: vineyardd
+      imagePrefix: "registry.aliyuncs.com"
+      imageName: vineyard/vineyardd
       imageTag: v0.22.2
     fuse:
-      imagePrefix: registry.aliyuncs.com/vineyard
-      imageName: vineyard-fluid-fuse
+      imagePrefix: "registry.aliyuncs.com"
+      imageName: vineyard/vineyard-fluid-fuse
       imageTag: v0.22.2
 
 webhook:
   enabled: true
   imagePrefix: *defaultImagePrefix
-  imageName: fluid-webhook
+  imageName: fluidcloudnative/fluid-webhook
   imageTag: *defaultVersion
   replicas: 1
   timeoutSeconds: 15
@@ -364,6 +364,6 @@ fluidapp:
   #     memory: 512Mi
   controller:
     imagePrefix: *defaultImagePrefix
-    imageName: application-controller
+    imageName: fluidcloudnative/application-controller
     imageTag: *defaultVersion
   featureGates: "DataflowAffinity=false"

deploy/helm/fluid/extension.yaml

@@ -61,3 +61,31 @@ installationMode: Multicluster
 #  executor-hook-image.kubesphere.io/install: ...
 #  executor-hook-image.kubesphere.io/upgrade: ...
 #  executor-hook-image.kubesphere.io/uninstall: ...
+images:
+  - docker.io/fluidcloudnative/csi-node-driver-registrar:v2.3.0
+  - docker.io/fluidcloudnative/fluid-csi:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/alluxioruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/dataset-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/efcruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/application-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/goosefsruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/jindoruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/juicefsruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/thinruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/vineyardruntime-controller:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/fluid-webhook:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/fluid-crd-upgrader:v1.0.5-7e917c7
+  - docker.io/fluidcloudnative/init-users:v0.9.0
+  - docker.io/juicedata/mount:ce-v1.2.0
+  - docker.io/juicedata/mount:ee-5.0.21-317356c
+  - docker.io/alluxio/alluxio-dev:2.9.0
+  - registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:6.2.0
+  - registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:6.2.0
+  - registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9
+  - registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-master:v1.2.2-19dcee9
+  - registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-worker:v1.2.2-19dcee9
+  - registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-fuse:v1.2.2-19dcee9
+  - registry.aliyuncs.com/vineyard/vineyardd:v0.22.2
+  - registry.aliyuncs.com/vineyard/vineyard-fluid-fuse:v0.22.2
+  - ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
+  - ccr.ccs.tencentyun.com/qcloud/goosefs-fuse:v1.2.0