Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/fluid/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions charts/fluid/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
5 changes: 1 addition & 4 deletions charts/fluid/templates/controller/efcruntime_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 . ) }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/fluid/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading