From 62145776761aae8264dcba561d487d2caa47b651 Mon Sep 17 00:00:00 2001 From: cheyang Date: Sun, 29 Oct 2023 17:50:04 +0800 Subject: [PATCH] Update 1.0.0.alpha.9, To #51568429 Signed-off-by: cheyang --- charts/fluid/Chart.yaml | 4 ++-- .../fluid/templates/upgrade/crd-upgrade.yaml | 3 +++ charts/fluid/values.yaml | 24 ++++++++++--------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/charts/fluid/Chart.yaml b/charts/fluid/Chart.yaml index 5d0a5d2..420f20a 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.0-alpha.8 +version: 1.0.0-alpha.9 # 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.0-985f833 +appVersion: 1.0.0-b388ae0 home: https://github.com/fluid-cloudnative/fluid keywords: - category:data diff --git a/charts/fluid/templates/upgrade/crd-upgrade.yaml b/charts/fluid/templates/upgrade/crd-upgrade.yaml index d4157c7..8f9f1ac 100644 --- a/charts/fluid/templates/upgrade/crd-upgrade.yaml +++ b/charts/fluid/templates/upgrade/crd-upgrade.yaml @@ -10,6 +10,9 @@ metadata: "helm.sh/hook-weight": "-4" "helm.sh/hook-delete-policy": before-hook-creation spec: +{{- if .Values.crdUpgrade.ttlSecondsAfterFinished }} + ttlSecondsAfterFinished: {{ .Values.crdUpgrade.ttlSecondsAfterFinished }} +{{- end }} template: spec: serviceAccountName: fluid-crds-upgrade diff --git a/charts/fluid/values.yaml b/charts/fluid/values.yaml index 431cabf..75622b4 100644 --- a/charts/fluid/values.yaml +++ b/charts/fluid/values.yaml @@ -10,7 +10,9 @@ helmDriver: configmap crdUpgrade: enabled: true - image: fluidcloudnative/fluid-crd-upgrader:v1.0.0-985f833 + # 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.0-b388ae0 ## if unspecified, will use built-in variable `.Release.Namespace`. namespace: fluid-system @@ -23,7 +25,7 @@ dataset: tolerations: - operator: Exists controller: - image: fluidcloudnative/dataset-controller:v1.0.0-985f833 + image: fluidcloudnative/dataset-controller:v1.0.0-b388ae0 csi: tolerations: @@ -34,7 +36,7 @@ csi: registrar: image: fluidcloudnative/csi-node-driver-registrar:v2.3.0 plugins: - image: fluidcloudnative/fluid-csi:v1.0.0-985f833 + image: fluidcloudnative/fluid-csi:v1.0.0-b388ae0 kubelet: kubeConfigFile: /etc/kubernetes/kubelet.conf certDir: /var/lib/kubelet/pki @@ -60,7 +62,7 @@ runtime: init: image: fluidcloudnative/init-users:v0.9.0 controller: - image: fluidcloudnative/alluxioruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/alluxioruntime-controller:v1.0.0-b388ae0 runtime: image: alluxio/alluxio-dev:2.9.0 fuse: @@ -81,7 +83,7 @@ runtime: fuse: image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:4.6.8 controller: - image: fluidcloudnative/jindoruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/jindoruntime-controller:v1.0.0-b388ae0 init: portCheck: enabled: false @@ -97,7 +99,7 @@ runtime: init: image: fluidcloudnative/init-users:v0.9.0 controller: - image: fluidcloudnative/goosefsruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/goosefsruntime-controller:v1.0.0-b388ae0 runtime: image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0 fuse: @@ -109,7 +111,7 @@ runtime: enabled: false runtimeWorkers: 3 controller: - image: fluidcloudnative/juicefsruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/juicefsruntime-controller:v1.0.0-b388ae0 fuse: ceimage: juicedata/juicefs-fuse:ce-v1.1.0-rc1 eeimage: juicedata/juicefs-fuse:ee-4.9.16 @@ -119,7 +121,7 @@ runtime: - operator: Exists enabled: false controller: - image: fluidcloudnative/thinruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/thinruntime-controller:v1.0.0-b388ae0 fuse: configStorage: configmap efc: @@ -128,7 +130,7 @@ runtime: - operator: Exists enabled: false controller: - image: fluidcloudnative/efcruntime-controller:v1.0.0-985f833 + image: fluidcloudnative/efcruntime-controller:v1.0.0-b388ae0 imagePullPolicy: Always init: image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9 @@ -141,7 +143,7 @@ runtime: webhook: enabled: true - image: fluidcloudnative/fluid-webhook:v1.0.0-985f833 + image: fluidcloudnative/fluid-webhook:v1.0.0-b388ae0 replicas: 1 timeoutSeconds: 15 reinvocationPolicy: IfNeeded @@ -168,4 +170,4 @@ fluidapp: tolerations: - operator: Exists controller: - image: fluidcloudnative/application-controller:v1.0.0-985f833 + image: fluidcloudnative/application-controller:v1.0.0-b388ae0