diff --git a/charts/fluid/fluid/templates/_helpers.tpl b/charts/fluid/fluid/templates/_helpers.tpl index 397fa590cc6..a350127d0bd 100644 --- a/charts/fluid/fluid/templates/_helpers.tpl +++ b/charts/fluid/fluid/templates/_helpers.tpl @@ -94,6 +94,34 @@ Create the name of the service account to use {{- end -}} {{- end -}} +{{/* assemble images for fluid control-plane images */}} +{{- define "fluid.controlplane.imageTransform" -}} + {{- $imagePrefix := index . 0 -}} + {{- $imageName := index . 1 -}} + {{- $imageTag := index . 2 -}} + + {{- /* 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." -}} + {{- end -}} + + {{- printf "%s/%s:%s" $imagePrefix $imageName $imageTag -}} +{{- end -}} + +{{/* assemble images for runtime images */}} +{{- define "fluid.runtime.imageTransform" -}} + {{- $imagePrefix := index . 0 -}} + {{- $imageName := index . 1 -}} + {{- $imageTag := index . 2 -}} + + {{- /* 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." -}} + {{- end -}} + + {{- printf "%s/%s:%s" $imagePrefix $imageName $imageTag -}} +{{- end -}} + {{/* Check if feature gate DataflowAffinity is enabled in the featureGates. diff --git a/charts/fluid/fluid/templates/controller/alluxioruntime_controller.yaml b/charts/fluid/fluid/templates/controller/alluxioruntime_controller.yaml index 1d95849621a..cf959150786 100644 --- a/charts/fluid/fluid/templates/controller/alluxioruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/alluxioruntime_controller.yaml @@ -44,7 +44,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.runtime.alluxio.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.alluxio.controller.imagePrefix .Values.runtime.alluxio.controller.imageName .Values.runtime.alluxio.controller.imageTag) }} name: manager command: ["alluxioruntime-controller", "start"] args: @@ -60,17 +60,17 @@ spec: - name: FLUID_WORKDIR value: {{ .Values.workdir | quote }} {{- end }} - {{- if .Values.runtime.alluxio.init.image }} + {{- if .Values.runtime.alluxio.init.imageName }} - name: DEFAULT_INIT_IMAGE_ENV - value: {{ .Values.runtime.alluxio.init.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.alluxio.init.imagePrefix .Values.runtime.alluxio.init.imageName .Values.runtime.alluxio.init.imageTag) }} {{- end }} - {{- if .Values.runtime.alluxio.runtime.image }} + {{- if .Values.runtime.alluxio.runtime.imageName }} - name: ALLUXIO_RUNTIME_IMAGE_ENV - value: {{ .Values.runtime.alluxio.runtime.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.alluxio.runtime.imagePrefix .Values.runtime.alluxio.runtime.imageName .Values.runtime.alluxio.runtime.imageTag) }} {{- end }} - {{- if .Values.runtime.alluxio.fuse.image }} + {{- if .Values.runtime.alluxio.fuse.imageName }} - name: ALLUXIO_FUSE_IMAGE_ENV - value: {{ .Values.runtime.alluxio.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.alluxio.fuse.imagePrefix .Values.runtime.alluxio.fuse.imageName .Values.runtime.alluxio.fuse.imageTag) }} {{- end }} {{- if .Values.runtime.mountRoot }} - name: MOUNT_ROOT diff --git a/charts/fluid/fluid/templates/controller/dataset_controller.yaml b/charts/fluid/fluid/templates/controller/dataset_controller.yaml index 4071fb252f6..1fd279ac53a 100644 --- a/charts/fluid/fluid/templates/controller/dataset_controller.yaml +++ b/charts/fluid/fluid/templates/controller/dataset_controller.yaml @@ -42,7 +42,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.dataset.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.dataset.controller.imagePrefix .Values.dataset.controller.imageName .Values.dataset.controller.imageTag) }} name: manager command: ["dataset-controller", "start"] args: @@ -59,9 +59,9 @@ spec: - name: JINDO_ENGINE_TYPE value: {{ .Values.runtime.jindo.engine | quote }} {{- end }} - {{- if .Values.runtime.alluxio.runtime.image }} + {{- if .Values.runtime.alluxio.runtime.imageName }} - name: ALLUXIO_RUNTIME_IMAGE_ENV - value: {{ .Values.runtime.alluxio.runtime.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.alluxio.runtime.imagePrefix .Values.runtime.alluxio.runtime.imageName .Values.runtime.alluxio.runtime.imageTag) }} {{- end }} {{- if .Values.image.imagePullSecrets }} - name: IMAGE_PULL_SECRETS diff --git a/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml b/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml index f4e33314032..ee14f37a805 100644 --- a/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/efcruntime_controller.yaml @@ -44,7 +44,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.runtime.efc.controller.image }}" + - 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 }} name: manager args: @@ -66,23 +66,23 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.efc.init.image }} + {{- if .Values.runtime.efc.init.imageName }} - name: EFC_INIT_FUSE_IMAGE_ENV - value: {{ .Values.runtime.efc.init.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.init.imagePrefix .Values.runtime.efc.init.imageName .Values.runtime.efc.init.imageTag) }} {{- end }} - {{- if .Values.runtime.efc.master.image }} + {{- if .Values.runtime.efc.master.imageName }} - name: EFC_MASTER_IMAGE_ENV - value: {{ .Values.runtime.efc.master.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.master.imagePrefix .Values.runtime.efc.master.imageName .Values.runtime.efc.master.imageTag) }} {{- end }} - {{- if .Values.runtime.efc.worker.image }} + {{- if .Values.runtime.efc.worker.imageName }} - name: EFC_WORKER_IMAGE_ENV - value: {{ .Values.runtime.efc.worker.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.worker.imagePrefix .Values.runtime.efc.worker.imageName .Values.runtime.efc.worker.imageTag) }} {{- end }} - {{- if .Values.runtime.efc.fuse.image }} + {{- if .Values.runtime.efc.fuse.imageName }} - name: EFC_FUSE_IMAGE_ENV - value: {{ .Values.runtime.efc.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.fuse.imagePrefix .Values.runtime.efc.fuse.imageName .Values.runtime.efc.fuse.imageTag) }} - name: EFC_SESSMGR_IMAGE_ENV - value: {{ .Values.runtime.efc.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.fuse.imagePrefix .Values.runtime.efc.fuse.imageName .Values.runtime.efc.fuse.imageTag) }} {{- end }} - name: HELM_DRIVER value: {{ template "fluid.helmDriver" . }} diff --git a/charts/fluid/fluid/templates/controller/fluidapp_controller.yaml b/charts/fluid/fluid/templates/controller/fluidapp_controller.yaml index 7db31903c64..5e5b3c1acad 100644 --- a/charts/fluid/fluid/templates/controller/fluidapp_controller.yaml +++ b/charts/fluid/fluid/templates/controller/fluidapp_controller.yaml @@ -40,7 +40,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.fluidapp.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.fluidapp.controller.imagePrefix .Values.fluidapp.controller.imageName .Values.fluidapp.controller.imageTag) }} name: manager command: ["fluidapp-controller", "start"] args: diff --git a/charts/fluid/fluid/templates/controller/goosefsruntime_controller.yaml b/charts/fluid/fluid/templates/controller/goosefsruntime_controller.yaml index 8186d7f1e58..89c8963abda 100644 --- a/charts/fluid/fluid/templates/controller/goosefsruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/goosefsruntime_controller.yaml @@ -44,7 +44,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.runtime.goosefs.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.goosefs.controller.imagePrefix .Values.runtime.goosefs.controller.imageName .Values.runtime.goosefs.controller.imageTag) }} imagePullPolicy: Always name: manager command: ["goosefsruntime-controller", "start"] @@ -61,17 +61,17 @@ spec: - name: FLUID_WORKDIR value: {{ .Values.workdir | quote }} {{- end }} - {{- if .Values.runtime.goosefs.init.image }} + {{- if .Values.runtime.goosefs.init.imageName }} - name: DEFAULT_INIT_IMAGE_ENV - value: {{ .Values.runtime.goosefs.init.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.goosefs.init.imagePrefix .Values.runtime.goosefs.init.imageName .Values.runtime.goosefs.init.imageTag) }} {{- end }} - {{- if .Values.runtime.goosefs.runtime.image }} + {{- if .Values.runtime.goosefs.runtime.imageName }} - name: GOOSEFS_RUNTIME_IMAGE_ENV - value: {{ .Values.runtime.goosefs.runtime.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.goosefs.runtime.imagePrefix .Values.runtime.goosefs.runtime.imageName .Values.runtime.goosefs.runtime.imageTag) }} {{- end }} - {{- if .Values.runtime.goosefs.fuse.image }} + {{- if .Values.runtime.goosefs.fuse.imageName }} - name: GOOSEFS_FUSE_IMAGE_ENV - value: {{ .Values.runtime.goosefs.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.goosefs.fuse.imagePrefix .Values.runtime.goosefs.fuse.imageName .Values.runtime.goosefs.fuse.imageTag) }} {{- end }} {{- if .Values.runtime.mountRoot }} - name: MOUNT_ROOT diff --git a/charts/fluid/fluid/templates/controller/jindoruntime_controller.yaml b/charts/fluid/fluid/templates/controller/jindoruntime_controller.yaml index 6201160e257..2b2296b0d1b 100644 --- a/charts/fluid/fluid/templates/controller/jindoruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/jindoruntime_controller.yaml @@ -43,7 +43,7 @@ spec: {{ toYaml .Values.runtime.jindo.tolerations | indent 6 }} {{- end }} containers: - - image: {{ .Values.runtime.jindo.controller.image | quote }} + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.jindo.controller.imagePrefix .Values.runtime.jindo.controller.imageName .Values.runtime.jindo.controller.imageTag) }} name: manager command: ["jindoruntime-controller", "start"] args: @@ -63,17 +63,17 @@ spec: - name: MOUNT_ROOT value: {{ .Values.runtime.mountRoot | quote }} {{- end }} - {{- if .Values.runtime.jindo.smartdata.image }} + {{- if .Values.runtime.jindo.smartdata.imageName }} - name: JINDO_SMARTDATA_IMAGE_ENV - value: {{ .Values.runtime.jindo.smartdata.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.jindo.smartdata.imagePrefix .Values.runtime.jindo.smartdata.imageName .Values.runtime.jindo.smartdata.imageTag) }} {{- end }} - {{- if .Values.runtime.jindo.fuse.image }} + {{- if .Values.runtime.jindo.fuse.imageName }} - name: JINDO_FUSE_IMAGE_ENV - value: {{ .Values.runtime.jindo.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.jindo.fuse.imagePrefix .Values.runtime.jindo.fuse.imageName .Values.runtime.jindo.fuse.imageTag) }} {{- end }} - {{- if .Values.runtime.jindo.init.image }} + {{- if .Values.runtime.jindo.init.imageName }} - name: DEFAULT_INIT_IMAGE_ENV - value: {{ .Values.runtime.jindo.init.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.jindo.init.imagePrefix .Values.runtime.jindo.init.imageName .Values.runtime.jindo.init.imageTag) }} {{- end }} {{- if .Values.runtime.jindo.init.portCheck }} - name: INIT_PORT_CHECK_ENABLED diff --git a/charts/fluid/fluid/templates/controller/juicefsruntime_controller.yaml b/charts/fluid/fluid/templates/controller/juicefsruntime_controller.yaml index f4d06e854b5..6926f647bf4 100644 --- a/charts/fluid/fluid/templates/controller/juicefsruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/juicefsruntime_controller.yaml @@ -44,7 +44,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.runtime.juicefs.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.juicefs.controller.imagePrefix .Values.runtime.juicefs.controller.imageName .Values.runtime.juicefs.controller.imageTag) }} name: manager args: - --development=false @@ -64,13 +64,13 @@ spec: {{- end }} value: {{ join "," $secretList | quote }} {{- end }} - {{- if .Values.runtime.juicefs.fuse.ceimage }} + {{- if .Values.runtime.juicefs.fuse.ceimageName }} - name: JUICEFS_CE_IMAGE_ENV - value: {{ .Values.runtime.juicefs.fuse.ceimage | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.juicefs.fuse.ceimagePrefix .Values.runtime.juicefs.fuse.ceimageName .Values.runtime.juicefs.fuse.ceimageTag) }} {{- end }} - {{- if .Values.runtime.juicefs.fuse.eeimage }} + {{- if .Values.runtime.juicefs.fuse.eeimageName }} - name: JUICEFS_EE_IMAGE_ENV - value: {{ .Values.runtime.juicefs.fuse.eeimage | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.juicefs.fuse.eeimagePrefix .Values.runtime.juicefs.fuse.eeimageName .Values.runtime.juicefs.fuse.eeimageTag) }} {{- end }} {{- if .Values.runtime.mountRoot }} - name: MOUNT_ROOT diff --git a/charts/fluid/fluid/templates/controller/thinruntime_controller.yaml b/charts/fluid/fluid/templates/controller/thinruntime_controller.yaml index 124799beb8e..d7177448dc1 100644 --- a/charts/fluid/fluid/templates/controller/thinruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/thinruntime_controller.yaml @@ -40,7 +40,7 @@ spec: {{- end }} #hostNetwork: true containers: - - image: "{{ .Values.runtime.thin.controller.image }}" + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.thin.controller.imagePrefix .Values.runtime.thin.controller.imageName .Values.runtime.thin.controller.imageTag) }} name: manager args: - --development=false diff --git a/charts/fluid/fluid/templates/controller/vineyardruntime_controller.yaml b/charts/fluid/fluid/templates/controller/vineyardruntime_controller.yaml index a815f7da382..f2e117c303a 100644 --- a/charts/fluid/fluid/templates/controller/vineyardruntime_controller.yaml +++ b/charts/fluid/fluid/templates/controller/vineyardruntime_controller.yaml @@ -43,7 +43,7 @@ spec: {{ toYaml .Values.runtime.vineyard.tolerations | indent 6 }} {{- end }} containers: - - image: {{ .Values.runtime.vineyard.controller.image | quote }} + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.runtime.vineyard.controller.imagePrefix .Values.runtime.vineyard.controller.imageName .Values.runtime.vineyard.controller.imageTag) }} name: manager command: ["vineyardruntime-controller", "start"] args: @@ -61,17 +61,17 @@ spec: - name: MOUNT_ROOT value: {{ .Values.runtime.mountRoot | quote }} {{- end }} - {{- if .Values.runtime.vineyard.master.image }} + {{- if .Values.runtime.vineyard.master.imageName }} - name: VINEYARD_MASTER_IMAGE_ENV - value: {{ .Values.runtime.vineyard.master.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.vineyard.master.imagePrefix .Values.runtime.vineyard.master.imageName .Values.runtime.vineyard.master.imageTag) }} {{- end }} - {{- if .Values.runtime.vineyard.worker.image }} + {{- if .Values.runtime.vineyard.worker.imageName }} - name: VINEYARD_WORKER_IMAGE_ENV - value: {{ .Values.runtime.vineyard.worker.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.vineyard.worker.imagePrefix .Values.runtime.vineyard.worker.imageName .Values.runtime.vineyard.worker.imageTag) }} {{- end }} - {{- if .Values.runtime.vineyard.fuse.image }} + {{- if .Values.runtime.vineyard.fuse.imageName }} - name: VINEYARD_FUSE_IMAGE_ENV - value: {{ .Values.runtime.vineyard.fuse.image | quote }} + value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.vineyard.fuse.imagePrefix .Values.runtime.vineyard.fuse.imageName .Values.runtime.vineyard.fuse.imageTag) }} {{- end }} {{- if .Values.runtime.syncRetryDuration }} - name: FLUID_SYNC_RETRY_DURATION diff --git a/charts/fluid/fluid/templates/csi/daemonset.yaml b/charts/fluid/fluid/templates/csi/daemonset.yaml index 074707b9e09..827d31e7826 100644 --- a/charts/fluid/fluid/templates/csi/daemonset.yaml +++ b/charts/fluid/fluid/templates/csi/daemonset.yaml @@ -40,7 +40,7 @@ spec: - virtual-kubelet containers: - name: node-driver-registrar - image: "{{ .Values.csi.registrar.image }}" + image: {{ include "fluid.controlplane.imageTransform" (list .Values.csi.registrar.imagePrefix .Values.csi.registrar.imageName .Values.csi.registrar.imageTag) }} args: - --v=5 - --csi-address={{ .Values.csi.kubelet.rootDir }}/csi-plugins/fuse.csi.fluid.io/csi.sock @@ -63,7 +63,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: "{{ .Values.csi.plugins.image }}" + image: {{ include "fluid.controlplane.imageTransform" (list .Values.csi.plugins.imagePrefix .Values.csi.plugins.imageName .Values.csi.plugins.imageTag) }} command: ["/usr/local/bin/entrypoint.sh"] args: - "--nodeid=$(NODE_ID)" diff --git a/charts/fluid/fluid/templates/upgrade/crd-upgrade.yaml b/charts/fluid/fluid/templates/upgrade/crd-upgrade.yaml index b5e28559258..9cd0a923da0 100644 --- a/charts/fluid/fluid/templates/upgrade/crd-upgrade.yaml +++ b/charts/fluid/fluid/templates/upgrade/crd-upgrade.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: fluid-crds-upgrade containers: - name: fluid-crds-upgrade - image: {{ .Values.crdUpgrade.image }} + image: {{ include "fluid.controlplane.imageTransform" (list .Values.crdUpgrade.imagePrefix .Values.crdUpgrade.imageName .Values.crdUpgrade.imageTag) }} command: ["bash", "/fluid/upgrade-crds.sh"] restartPolicy: OnFailure --- diff --git a/charts/fluid/fluid/templates/webhook/webhook.yaml b/charts/fluid/fluid/templates/webhook/webhook.yaml index fbfbbeda9e5..0d5d520ebaf 100644 --- a/charts/fluid/fluid/templates/webhook/webhook.yaml +++ b/charts/fluid/fluid/templates/webhook/webhook.yaml @@ -26,7 +26,7 @@ spec: {{- end }} serviceAccountName: fluid-webhook containers: - - image: {{ .Values.webhook.image | quote }} + - image: {{ include "fluid.controlplane.imageTransform" (list .Values.webhook.imagePrefix .Values.webhook.imageName .Values.webhook.imageTag) }} name: manager command: ["fluid-webhook", "start"] args: diff --git a/charts/fluid/fluid/values.yaml b/charts/fluid/fluid/values.yaml index 7ec4ef7fea7..5c40caffd39 100644 --- a/charts/fluid/fluid/values.yaml +++ b/charts/fluid/fluid/values.yaml @@ -8,24 +8,33 @@ workdir: /tmp # 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 registry.aliyuncs.com/fluid +version: &defaultVersion v1.0.2-ca7a430 + crdUpgrade: enabled: true # This sets the time-to-live (TTL) for crd-upgrade jobs. Default is 259200 seconds (3 days). ttlSecondsAfterFinished: 259200 - image: fluidcloudnative/fluid-crd-upgrader:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: fluid-crd-upgrader + imageTag: *defaultVersion ## if unspecified, will use built-in variable `.Release.Namespace`. namespace: fluid-system -image: - imagePullSecrets: [] - dataset: replicas: 1 tolerations: - operator: Exists controller: - image: fluidcloudnative/dataset-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: dataset-controller + imageTag: *defaultVersion csi: tolerations: @@ -34,9 +43,13 @@ csi: config: hostNetwork: false registrar: - image: fluidcloudnative/csi-node-driver-registrar:v2.3.0 + imagePrefix: *defaultImagePrefix + imageName: csi-node-driver-registrar + imageTag: v2.3.0 plugins: - image: fluidcloudnative/fluid-csi:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: fluid-csi + imageTag: *defaultVersion kubelet: kubeConfigFile: /etc/kubernetes/kubelet.conf certDir: /var/lib/kubelet/pki @@ -61,13 +74,21 @@ runtime: portAllocatePolicy: random enabled: false init: - image: fluidcloudnative/init-users:v0.9.0 + imagePrefix: *defaultImagePrefix + imageName: init-users + imageTag: v0.9.0 controller: - image: fluidcloudnative/alluxioruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: alluxioruntime-controller + imageTag: *defaultVersion runtime: - image: alluxio/alluxio-dev:2.9.0 + imagePrefix: alluxio + imageName: alluxio-dev + imageTag: 2.9.0 fuse: - image: alluxio/alluxio-dev:2.9.0 + imagePrefix: alluxio + imageName: alluxio-dev + imageTag: 2.9.0 mountConfigStorage: configmap jindo: replicas: 1 @@ -80,15 +101,23 @@ runtime: engine: jindocache queryUfsTotal: true smartdata: - image: registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:6.2.0 + imagePrefix: registry.cn-shanghai.aliyuncs.com/jindofs + imageName: smartdata + imageTag: 6.2.0 fuse: - image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:6.2.0 + imagePrefix: registry.cn-shanghai.aliyuncs.com/jindofs + imageName: jindo-fuse + imageTag: 6.2.0 controller: - image: fluidcloudnative/jindoruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: jindoruntime-controller + imageTag: *defaultVersion init: portCheck: enabled: false - image: fluidcloudnative/init-users:v0.9.0 + imagePrefix: *defaultImagePrefix + imageName: init-users + imageTag: v0.9.0 goosefs: replicas: 1 tolerations: @@ -98,13 +127,21 @@ runtime: portAllocatePolicy: random enabled: false init: - image: fluidcloudnative/init-users:v0.9.0 + imagePrefix: *defaultImagePrefix + imageName: init-users + imageTag: v0.9.0 controller: - image: fluidcloudnative/goosefsruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: goosefsruntime-controller + imageTag: *defaultVersion runtime: - image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0 + imagePrefix: ccr.ccs.tencentyun.com/qcloud + imageName: goosefs + imageTag: v1.2.0 fuse: - image: ccr.ccs.tencentyun.com/qcloud/goosefs-fuse:v1.2.0 + imagePrefix: ccr.ccs.tencentyun.com/qcloud + imageName: goosefs-fuse + imageTag: v1.2.0 juicefs: replicas: 1 tolerations: @@ -112,17 +149,25 @@ runtime: enabled: false runtimeWorkers: 3 controller: - image: fluidcloudnative/juicefsruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: juicefsruntime-controller + imageTag: *defaultVersion fuse: - ceimage: juicedata/juicefs-fuse:ce-v1.1.0-rc1 - eeimage: juicedata/juicefs-fuse:ee-4.9.16 + ceimagePrefix: juicedata + ceimageName: juicefs-fuse + ceimageTag: ce-v1.1.0-rc1 + eeimagePrefix: juicedata + eeimageName: juicefs-fuse + eeimageTag: ee-4.9.16 thin: replicas: 1 tolerations: - operator: Exists enabled: false controller: - image: fluidcloudnative/thinruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: thinruntime-controller + imageTag: *defaultVersion fuse: configStorage: configmap efc: @@ -131,16 +176,26 @@ runtime: - operator: Exists enabled: false controller: - image: fluidcloudnative/efcruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: efcruntime-controller + imageTag: *defaultVersion imagePullPolicy: Always init: - image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9 + imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache + imageName: init-alifuse + imageTag: v1.2.2-19dcee9 master: - image: registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-master:v1.2.2-19dcee9 + imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache + imageName: efc-master + imageTag: v1.2.2-19dcee9 worker: - image: registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-worker:v1.2.2-19dcee9 + imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache + imageName: efc-worker + imageTag: v1.2.2-19dcee9 fuse: - image: registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-fuse:v1.2.2-19dcee9 + imagePrefix: registry.cn-zhangjiakou.aliyuncs.com/nascache + imageName: efc-fuse + imageTag: v1.2.2-19dcee9 vineyard: replicas: 1 portRange: 32000-34000 @@ -148,18 +203,28 @@ runtime: - operator: Exists enabled: false controller: - image: fluidcloudnative/vineyardruntime-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: vineyardruntime-controller + imageTag: *defaultVersion imagePullPolicy: Always master: - image: registry.aliyuncs.com/vineyard/vineyardd:v0.22.2 + imagePrefix: registry.aliyuncs.com/vineyard + imageName: vineyardd + imageTag: v0.22.2 worker: - image: registry.aliyuncs.com/vineyard/vineyardd:v0.22.2 + imagePrefix: registry.aliyuncs.com/vineyard + imageName: vineyardd + imageTag: v0.22.2 fuse: - image: registry.aliyuncs.com/vineyard/vineyard-fluid-fuse:v0.22.2 + imagePrefix: registry.aliyuncs.com/vineyard + imageName: vineyard-fluid-fuse + imageTag: v0.22.2 webhook: enabled: true - image: fluidcloudnative/fluid-webhook:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: fluid-webhook + imageTag: *defaultVersion replicas: 1 timeoutSeconds: 15 reinvocationPolicy: IfNeeded @@ -210,5 +275,7 @@ fluidapp: tolerations: - operator: Exists controller: - image: fluidcloudnative/application-controller:v1.0.2-ca7a430 + imagePrefix: *defaultImagePrefix + imageName: application-controller + imageTag: *defaultVersion featureGates: "DataflowAffinity=false"