Merge pull request #63 from cheyang/helm-chart-fluid-1.0.1-alpha.5

Add helm-chart-fluid-1.0.1-alpha.5
fluid-cloudnative · Jun 27, 2024 · f0e9ab5 · f0e9ab5
2 parents 54f4719 + 6026205
commit f0e9ab5
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 27 deletions.
diff --git 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.1-alpha.4
+version: 1.0.1-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.1-38cd089
+appVersion: 1.0.1-620babc
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/templates/_helpers.tpl b/charts/fluid/templates/_helpers.tpl
@@ -99,7 +99,7 @@ Create the name of the service account to use
 Check if feature gate DataflowAffinity is enabled in the featureGates.
 */}}
 {{- define "fluid.dataflowAffinity.enabled" -}}
-{{- $featureGates := splitList "," .Values.dataset.featureGates }}
+{{- $featureGates := splitList "," .Values.fluidapp.featureGates }}
 {{- $found := false -}}
 {{- range $idx, $featureGate := $featureGates }}
     {{- $featureGateKV := splitList "=" $featureGate }}

diff --git a/charts/fluid/templates/controller/dataset_controller.yaml b/charts/fluid/templates/controller/dataset_controller.yaml
@@ -50,7 +50,6 @@ spec:
           - --pprof-addr=:6060
           - --enable-leader-election
           - --leader-election-namespace={{ include "fluid.namespace" . }}
-          - --feature-gates={{ .Values.dataset.featureGates }}
         env:
           {{- if .Values.workdir }}
           - name: FLUID_WORKDIR

diff --git a/charts/fluid/templates/controller/fluidapp_controller.yaml b/charts/fluid/templates/controller/fluidapp_controller.yaml
@@ -48,6 +48,7 @@ spec:
           - --pprof-addr=:6060
           - --enable-leader-election
           - --leader-election-namespace={{ include "fluid.namespace" . }}
+          - --feature-gates={{ .Values.fluidapp.featureGates }}
         env:
         {{- if .Values.workdir }}
           - name: FLUID_WORKDIR

diff --git a/charts/fluid/templates/role/dataset/rbac.yaml b/charts/fluid/templates/role/dataset/rbac.yaml
@@ -13,16 +13,6 @@ rules:
     - get
     - list
     - watch
-  {{- if eq (include "fluid.dataflowAffinity.enabled" . ) "true" }}
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - get
-      - list
-      - watch
-  {{- end }}
   - apiGroups:
     - ""
     resources:

diff --git a/charts/fluid/templates/role/fluidapp/rbac.yaml b/charts/fluid/templates/role/fluidapp/rbac.yaml
@@ -12,6 +12,25 @@ rules:
       - get
       - watch
       - create
+  {{- if eq (include "fluid.dataflowAffinity.enabled" . ) "true" }}
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - batch
+    resources:
+      - jobs
+    verbs:
+      - get
+      - list
+      - watch
+      - update
+  {{- end }}
   - apiGroups:
       - ""
     resources:

diff --git a/charts/fluid/values.yaml b/charts/fluid/values.yaml
@@ -12,7 +12,7 @@ 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.1-38cd089
+  image: fluidcloudnative/fluid-crd-upgrader:v1.0.1-620babc
 
 ##  if unspecified, will use built-in variable `.Release.Namespace`.
 namespace: fluid-system
@@ -25,8 +25,7 @@ dataset:
   tolerations:
     - operator: Exists
   controller:
-    image: fluidcloudnative/dataset-controller:v1.0.1-38cd089
-  featureGates: "DataflowAffinity=false"
+    image: fluidcloudnative/dataset-controller:v1.0.1-620babc
 
 csi:
   tolerations:
@@ -37,7 +36,7 @@ csi:
   registrar:
     image: fluidcloudnative/csi-node-driver-registrar:v2.3.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v1.0.1-38cd089
+    image: fluidcloudnative/fluid-csi:v1.0.1-620babc
   kubelet:
     kubeConfigFile: /etc/kubernetes/kubelet.conf
     certDir: /var/lib/kubelet/pki
@@ -64,7 +63,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/alluxioruntime-controller:v1.0.1-620babc
     runtime:
       image: alluxio/alluxio-dev:2.9.0
     fuse:
@@ -85,7 +84,7 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:6.4.0
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/jindoruntime-controller:v1.0.1-620babc
     init:
       portCheck:
         enabled: false
@@ -101,7 +100,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/goosefsruntime-controller:v1.0.1-620babc
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
@@ -113,7 +112,7 @@ runtime:
     enabled: false
     runtimeWorkers: 3
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/juicefsruntime-controller:v1.0.1-620babc
     fuse:
       ceimage: juicedata/juicefs-fuse:ce-v1.1.0-rc1
       eeimage: juicedata/juicefs-fuse:ee-4.9.16
@@ -123,7 +122,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/thinruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/thinruntime-controller:v1.0.1-620babc
     fuse:
       configStorage: configmap
   efc:
@@ -132,7 +131,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/efcruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/efcruntime-controller:v1.0.1-620babc
       imagePullPolicy: Always
     init:
       image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9
@@ -149,7 +148,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/vineyardruntime-controller:v1.0.1-38cd089
+      image: fluidcloudnative/vineyardruntime-controller:v1.0.1-620babc
       imagePullPolicy: Always
     master:
       image: registry.aliyuncs.com/vineyard/vineyardd:v0.22.2
@@ -160,7 +159,7 @@ runtime:
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v1.0.1-38cd089
+  image: fluidcloudnative/fluid-webhook:v1.0.1-620babc
   replicas: 1
   timeoutSeconds: 15
   reinvocationPolicy: IfNeeded
@@ -204,10 +203,12 @@ webhook:
           required:
             - fluid.io/node
 
+
 fluidapp:
   enabled: true
   replicas: 1
   tolerations:
     - operator: Exists
   controller:
-    image: fluidcloudnative/application-controller:v1.0.1-38cd089
+    image: fluidcloudnative/application-controller:v1.0.1-620babc
+  featureGates: "DataflowAffinity=false"