diff --git a/charts/fluid/Chart.yaml b/charts/fluid/Chart.yaml index 5b977ae..c11fa76 100644 --- a/charts/fluid/Chart.yaml +++ b/charts/fluid/Chart.yaml @@ -14,11 +14,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. -version: 1.0.8-alpha.4 +version: 1.0.8-alpha.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 1.0.8-29e1c1e +appVersion: 1.0.8-6533239 home: https://github.com/fluid-cloudnative/fluid keywords: - category:data diff --git a/charts/fluid/templates/_helpers.tpl b/charts/fluid/templates/_helpers.tpl index 774b8db..ef820f0 100644 --- a/charts/fluid/templates/_helpers.tpl +++ b/charts/fluid/templates/_helpers.tpl @@ -161,3 +161,11 @@ Check if feature gate DataflowAffinity is enabled in the featureGates. {{- end -}} {{- $found -}} {{- end -}} + +{{/* Common syncScheduleInfoNodeExcludeSelector env for all runtime controllers*/}} +{{- define "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" -}} +{{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} +- name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR + value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} +{{- end }} +{{- end -}} diff --git a/charts/fluid/templates/controller/alluxioruntime_controller.yaml b/charts/fluid/templates/controller/alluxioruntime_controller.yaml index ac45bed..246bc1d 100644 --- a/charts/fluid/templates/controller/alluxioruntime_controller.yaml +++ b/charts/fluid/templates/controller/alluxioruntime_controller.yaml @@ -81,10 +81,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }} {{- if .Values.image.imagePullSecrets }} - name: IMAGE_PULL_SECRETS {{- $secretList := list }} diff --git a/charts/fluid/templates/controller/efcruntime_controller.yaml b/charts/fluid/templates/controller/efcruntime_controller.yaml index 729a3a8..f7037a1 100644 --- a/charts/fluid/templates/controller/efcruntime_controller.yaml +++ b/charts/fluid/templates/controller/efcruntime_controller.yaml @@ -63,10 +63,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }} {{- if .Values.runtime.efc.init.imageName }} - name: EFC_INIT_FUSE_IMAGE_ENV value: {{ include "fluid.runtime.imageTransform" (list .Values.runtime.efc.init.imagePrefix .Values.runtime.efc.init.imageName .Values.runtime.efc.init.imageTag . ) }} diff --git a/charts/fluid/templates/controller/goosefsruntime_controller.yaml b/charts/fluid/templates/controller/goosefsruntime_controller.yaml index 16c8c79..d0b5ed3 100644 --- a/charts/fluid/templates/controller/goosefsruntime_controller.yaml +++ b/charts/fluid/templates/controller/goosefsruntime_controller.yaml @@ -79,10 +79,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }} {{- if .Values.runtime.goosefs.env }} {{ toYaml .Values.runtime.goosefs.env | nindent 10 }} {{- end }} diff --git a/charts/fluid/templates/controller/jindoruntime_controller.yaml b/charts/fluid/templates/controller/jindoruntime_controller.yaml index 9f229ac..e8062f0 100644 --- a/charts/fluid/templates/controller/jindoruntime_controller.yaml +++ b/charts/fluid/templates/controller/jindoruntime_controller.yaml @@ -84,10 +84,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 8 }} {{- if .Values.runtime.jindo.engine }} - name: JINDO_ENGINE_TYPE value: {{ .Values.runtime.jindo.engine | quote }} @@ -99,7 +96,7 @@ spec: - name: HELM_DRIVER value: {{ template "fluid.helmDriver" . }} {{- if .Values.runtime.jindo.env }} - {{ toYaml .Values.runtime.jindo.env | nindent 10 }} + {{ toYaml .Values.runtime.jindo.env | nindent 8 }} {{- end }} ports: - containerPort: 8080 diff --git a/charts/fluid/templates/controller/juicefsruntime_controller.yaml b/charts/fluid/templates/controller/juicefsruntime_controller.yaml index d31cd34..d38a67c 100644 --- a/charts/fluid/templates/controller/juicefsruntime_controller.yaml +++ b/charts/fluid/templates/controller/juicefsruntime_controller.yaml @@ -81,10 +81,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }} - name: HELM_DRIVER value: {{ template "fluid.helmDriver" . }} {{- if .Values.runtime.juicefs.env }} diff --git a/charts/fluid/templates/controller/thinruntime_controller.yaml b/charts/fluid/templates/controller/thinruntime_controller.yaml index 5660076..69017e9 100644 --- a/charts/fluid/templates/controller/thinruntime_controller.yaml +++ b/charts/fluid/templates/controller/thinruntime_controller.yaml @@ -63,10 +63,7 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.thin.syncRetryRateLimitDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 10 }} - name: HELM_DRIVER value: {{ template "fluid.helmDriver" . }} - name: THIN_FUSE_CONFIG_STORAGE diff --git a/charts/fluid/templates/controller/vineyardruntime_controller.yaml b/charts/fluid/templates/controller/vineyardruntime_controller.yaml index a04dcb6..8d5c818 100644 --- a/charts/fluid/templates/controller/vineyardruntime_controller.yaml +++ b/charts/fluid/templates/controller/vineyardruntime_controller.yaml @@ -75,14 +75,11 @@ spec: - name: FLUID_SYNC_RETRY_DURATION value: {{ .Values.runtime.syncRetryDuration | quote }} {{- end }} - {{- if .Values.runtime.syncScheduleInfoNodeExcludeSelector }} - - name: FLUID_SCHEDULE_INFO_EXCLUDE_NODE_SELECTOR - value: {{ .Values.runtime.syncScheduleInfoNodeExcludeSelector | quote }} - {{- end }} + {{- include "fluid.controllers.envs.syncScheduleInfoNodeExcludeSelector" . | nindent 8 }} - name: HELM_DRIVER value: {{ template "fluid.helmDriver" . }} {{- if .Values.runtime.vineyard.env }} - {{ toYaml .Values.runtime.vineyard.env | nindent 10 }} + {{ toYaml .Values.runtime.vineyard.env | nindent 8 }} {{- end }} ports: - containerPort: 8080 diff --git a/charts/fluid/values.yaml b/charts/fluid/values.yaml index ab04517..7035a0a 100644 --- a/charts/fluid/values.yaml +++ b/charts/fluid/values.yaml @@ -14,7 +14,7 @@ image: # Default registry, namespace and version tag for images managed by fluid imagePrefix: &defaultImagePrefix fluidcloudnative # imagePrefix: &defaultImagePrefix registry.aliyuncs.com/fluid -version: &defaultVersion v1.0.8-29e1c1e +version: &defaultVersion v1.0.8-6533239 crdUpgrade: enabled: true