Merge pull request #41 from cheyang/helm-chart-fluid-1.0.0-alpha.13

Update helm-chart-fluid-1.0.0-alpha.13
fluid-cloudnative · Dec 15, 2023 · 1fd93b7 · 1fd93b7
2 parents 3876412 + 42079dc
commit 1fd93b7
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 48 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.0-alpha.12
+version: 1.0.0-alpha.13
 
 # 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-11ffb69
+appVersion: 1.0.0-8abc63f
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/templates/webhook/plugins-profile.yaml b/charts/fluid/templates/webhook/plugins-profile.yaml
@@ -0,0 +1,19 @@
+{{ if .Values.webhook.enabled -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: webhook-plugins
+  namespace: {{ include "fluid.namespace" . }}
+data:
+  pluginsProfile: |
+{{- if .Values.webhook.forceReplacePluginsProfile }}
+{{ toYaml .Values.webhook.pluginsProfile | indent 4 }}
+{{- else }}
+{{- $existing := (lookup "v1" "ConfigMap" (include "fluid.namespace" .)  "webhook-plugins") }}
+{{- if $existing }}
+{{ $existing.data.pluginsProfile | indent 4 }}
+{{- else }}
+{{ toYaml .Values.webhook.pluginsProfile | indent 4 }}
+{{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/fluid/templates/webhook/tiered-conf.yaml b/charts/fluid/templates/webhook/tiered-conf.yaml
diff --git a/charts/fluid/templates/webhook/webhook.yaml b/charts/fluid/templates/webhook/webhook.yaml
@@ -58,4 +58,15 @@ spec:
           - containerPort: 8080
             name: metrics
             protocol: TCP
+        volumeMounts:
+          - mountPath: /etc/fluid
+            name: webhook-plugins
+      volumes:
+        - name: webhook-plugins
+          configMap:
+            name: webhook-plugins
+            items:
+              - key: pluginsProfile
+                path: plugins.profile
+                mode: 0444
 {{- end }}
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.0-11ffb69
+  image: fluidcloudnative/fluid-crd-upgrader:v1.0.0-8abc63f
 
 ##  if unspecified, will use built-in variable `.Release.Namespace`.
 namespace: fluid-system
@@ -25,7 +25,7 @@ dataset:
   tolerations:
     - operator: Exists
   controller:
-    image: fluidcloudnative/dataset-controller:v1.0.0-11ffb69
+    image: fluidcloudnative/dataset-controller:v1.0.0-8abc63f
 
 csi:
   tolerations:
@@ -36,7 +36,7 @@ csi:
   registrar:
     image: fluidcloudnative/csi-node-driver-registrar:v2.3.0
   plugins:
-    image: fluidcloudnative/fluid-csi:v1.0.0-11ffb69
+    image: fluidcloudnative/fluid-csi:v1.0.0-8abc63f
   kubelet:
     kubeConfigFile: /etc/kubernetes/kubelet.conf
     certDir: /var/lib/kubelet/pki
@@ -62,7 +62,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v1.0.0-11ffb69
+      image: fluidcloudnative/alluxioruntime-controller:v1.0.0-8abc63f
     runtime:
       image: alluxio/alluxio-dev:2.9.0
     fuse:
@@ -83,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-11ffb69
+      image: fluidcloudnative/jindoruntime-controller:v1.0.0-8abc63f
     init:
       portCheck:
         enabled: false
@@ -99,7 +99,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v1.0.0-11ffb69
+      image: fluidcloudnative/goosefsruntime-controller:v1.0.0-8abc63f
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
@@ -111,7 +111,7 @@ runtime:
     enabled: false
     runtimeWorkers: 3
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v1.0.0-11ffb69
+      image: fluidcloudnative/juicefsruntime-controller:v1.0.0-8abc63f
     fuse:
       ceimage: juicedata/juicefs-fuse:ce-v1.1.0-rc1
       eeimage: juicedata/juicefs-fuse:ee-4.9.16
@@ -121,7 +121,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/thinruntime-controller:v1.0.0-11ffb69
+      image: fluidcloudnative/thinruntime-controller:v1.0.0-8abc63f
     fuse:
       configStorage: configmap
   efc:
@@ -130,7 +130,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/efcruntime-controller:v1.0.0-11ffb69
+      image: fluidcloudnative/efcruntime-controller:v1.0.0-8abc63f
       imagePullPolicy: Always
     init:
       image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9
@@ -143,33 +143,51 @@ runtime:
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v1.0.0-11ffb69
+  image: fluidcloudnative/fluid-webhook:v1.0.0-8abc63f
   replicas: 1
   timeoutSeconds: 15
   reinvocationPolicy: IfNeeded
   tolerations:
     - operator: Exists
-  # if configmap `tiered-locality-config` exists and not want to replace the content, set this to false.
-  forceReplaceTieredLocality: false
-  tieredLocality:
-    preferred:
-      # fluid existed node affinity, the name can not be modified.
-      - name: fluid.io/node
-        weight: 100
-      # runtime worker's zone label name, can be changed according to k8s environment.
-      - name: topology.kubernetes.io/zone
-        weight: 50
-      # runtime worker's region label name, can be changed according to k8s environment.
-      - name: topology.kubernetes.io/region
-        weight: 20
-    # used when app pod with label fluid.io/dataset.{dataset name}.sched set true
-    required:
-      - fluid.io/node
+  # if configmap `webhook-plugins` exists and not want to replace the content, set this to false.
+  forceReplacePluginsProfile: false
+  pluginsProfile:
+    plugins:
+      # serverful webhook plugins
+      serverful:
+        withDataset:
+          - RequireNodeWithFuse
+          - NodeAffinityWithCache
+          - MountPropagationInjector
+        withoutDataset:
+          - PreferNodesWithoutCache
+      # serverless webhook plugins
+      serverless:
+        withDataset:
+          - FuseSidecar
+        withoutDataset: []
+    pluginConfig:
+      - name: NodeAffinityWithCache
+        # plugin args is a serialized yaml string.
+        args: |
+          preferred:
+            # fluid existed node affinity, the name can not be modified.
+            - name: fluid.io/node
+              weight: 100
+            # runtime worker's zone label name, can be changed according to k8s environment.
+            - name: topology.kubernetes.io/zone
+              weight: 50
+            # runtime worker's region label name, can be changed according to k8s environment.
+            - name: topology.kubernetes.io/region
+              weight: 20
+          # used when app pod with label fluid.io/dataset.{dataset name}.sched set true
+          required:
+            - fluid.io/node
 
 fluidapp:
   enabled: true
   replicas: 1
   tolerations:
     - operator: Exists
   controller:
-    image: fluidcloudnative/application-controller:v1.0.0-11ffb69
+    image: fluidcloudnative/application-controller:v1.0.0-8abc63f