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.2
version: 1.0.8-alpha.3

# 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-2cfd7995
appVersion: 1.0.8-9b73834
home: https://github.com/fluid-cloudnative/fluid
keywords:
- category:data
Expand Down
11 changes: 11 additions & 0 deletions charts/fluid/crds/data.fluid.io_thinruntimeprofiles.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,17 @@ spec:
additionalProperties:
type: string
type: object
podMetadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
ports:
items:
properties:
Expand Down
11 changes: 11 additions & 0 deletions charts/fluid/crds/data.fluid.io_thinruntimes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,17 @@ spec:
additionalProperties:
type: string
type: object
podMetadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
ports:
items:
properties:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ 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 }}
{{- if .Values.image.imagePullSecrets }}
- name: IMAGE_PULL_SECRETS
{{- $secretList := list }}
Expand Down
4 changes: 4 additions & 0 deletions charts/fluid/templates/controller/efcruntime_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ 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 }}
{{- 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,6 +79,10 @@ 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 }}
{{- 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,6 +84,10 @@ 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 }}
{{- if .Values.runtime.jindo.engine }}
- name: JINDO_ENGINE_TYPE
value: {{ .Values.runtime.jindo.engine | quote }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ 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 }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
{{- if .Values.runtime.juicefs.env }}
Expand Down
4 changes: 4 additions & 0 deletions charts/fluid/templates/controller/thinruntime_controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ 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 }}
- 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,6 +75,10 @@ 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 }}
- name: HELM_DRIVER
value: {{ template "fluid.helmDriver" . }}
{{- if .Values.runtime.vineyard.env }}
Expand Down
7 changes: 5 additions & 2 deletions 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-2cfd7995
version: &defaultVersion v1.0.8-9b73834

crdUpgrade:
enabled: true
Expand Down Expand Up @@ -61,7 +61,7 @@ csi:
registrar:
imagePrefix: *defaultImagePrefix
imageName: csi-node-driver-registrar
imageTag: v2.3.0
imageTag: v2.14.0
plugins:
imagePrefix: *defaultImagePrefix
imageName: fluid-csi
Expand All @@ -84,6 +84,9 @@ csi:
runtime:
criticalFusePod: true
syncRetryDuration: 15s
# syncScheduleInfoNodeExcludeSelector is used to exclude nodes that should be skipped when syncing schedule info
# e.g. syncScheduleInfoNodeExcludeSelector: "mynode=dev,type=virtual-kubelet"
syncScheduleInfoNodeExcludeSelector: ""
mountRoot: /runtime-mnt
alluxio:
replicas: 1
Expand Down
Loading