helm-chart-fluid-1.0.1-alpha.1, To #55315018

fluid-cloudnative · May 10, 2024 · 0a953ae · 0a953ae
1 parent a219164
commit 0a953ae
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 20 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
+version: 1.0.1-alpha.1
 
 # 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-31f5433
+appVersion: 1.0.1-84d04ae
 home: https://github.com/fluid-cloudnative/fluid
 keywords:
   - category:data

diff --git a/charts/fluid/crds/data.fluid.io_vineyardruntimes.yaml b/charts/fluid/crds/data.fluid.io_vineyardruntimes.yaml
@@ -116,6 +116,28 @@ spec:
                   imageTag:
                     description: Image Tag for Vineyard Fuse Default is `v0.21.5`
                     type: string
+                  networkMode:
+                    description: Whether to use hostnetwork or not Default is HostNetwork
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
+                  podMetadata:
+                    description: PodMetadata defines labels and annotations that will
+                      be propagated to Vineyard's pods.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations are annotations of pod specification
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: Labels are labels of pod specification
+                        type: object
+                    type: object
                   resources:
                     description: Resources contains the resource requirements and
                       limits for the Vineyard Fuse. Default is not set.
@@ -219,6 +241,13 @@ spec:
                       the default image tag is `3.5.10`. For Worker, the default image
                       tag is `v0.21.5`.
                     type: string
+                  networkMode:
+                    description: Whether to use hostnetwork or not Default is HostNetwork
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -239,6 +268,22 @@ spec:
                       \n vineyardd.reserve.memory: \"true\" etcd.prefix: \"/vineyard\"
                       wait.etcd.timeout: \"120\""
                     type: object
+                  podMetadata:
+                    description: PodMetadata defines labels and annotations that will
+                      be propagated to Vineyard's pods including Master and Worker.
+                      Default is not set.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations are annotations of pod specification
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: Labels are labels of pod specification
+                        type: object
+                    type: object
                   ports:
                     additionalProperties:
                       type: integer
@@ -328,6 +373,21 @@ spec:
                       type: object
                     type: array
                 type: object
+              podMetadata:
+                description: PodMetadata defines labels and annotations that will
+                  be propagated to Vineyard's pods.
+                properties:
+                  annotations:
+                    additionalProperties:
+                      type: string
+                    description: Annotations are annotations of pod specification
+                    type: object
+                  labels:
+                    additionalProperties:
+                      type: string
+                    description: Labels are labels of pod specification
+                    type: object
+                type: object
               replicas:
                 description: The replicas of the worker, need to be specified If worker.replicas
                   and the field are both specified, the field will be respected
@@ -3507,6 +3567,13 @@ spec:
                       the default image tag is `3.5.10`. For Worker, the default image
                       tag is `v0.21.5`.
                     type: string
+                  networkMode:
+                    description: Whether to use hostnetwork or not Default is HostNetwork
+                    enum:
+                    - HostNetwork
+                    - ""
+                    - ContainerNetwork
+                    type: string
                   nodeSelector:
                     additionalProperties:
                       type: string
@@ -3527,6 +3594,22 @@ spec:
                       \n vineyardd.reserve.memory: \"true\" etcd.prefix: \"/vineyard\"
                       wait.etcd.timeout: \"120\""
                     type: object
+                  podMetadata:
+                    description: PodMetadata defines labels and annotations that will
+                      be propagated to Vineyard's pods including Master and Worker.
+                      Default is not set.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: Annotations are annotations of pod specification
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: Labels are labels of pod specification
+                        type: object
+                    type: object
                   ports:
                     additionalProperties:
                       type: integer

diff --git a/charts/fluid/templates/controller/vineyardruntime_controller.yaml b/charts/fluid/templates/controller/vineyardruntime_controller.yaml
@@ -48,6 +48,7 @@ spec:
         command: ["vineyardruntime-controller", "start"]
         args:
           - --development=false
+          - --runtime-node-port-range={{ .Values.runtime.vineyard.portRange }}
           - --pprof-addr=:6060
           - --enable-leader-election
           - --leader-election-namespace={{ include "fluid.namespace" . }}

diff --git a/charts/fluid/templates/role/jindo/rbac.yaml b/charts/fluid/templates/role/jindo/rbac.yaml
@@ -74,12 +74,6 @@ rules:
     verbs:
     - create
     - patch
-  - apiGroups:
-    - ""
-    resources:
-    - secrets
-    verbs:
-    - get
 {{- template "fluid.helmDriver.rbacs" . }}
   - apiGroups:
     - ""

diff --git a/charts/fluid/templates/role/thin/rbac.yaml b/charts/fluid/templates/role/thin/rbac.yaml
@@ -54,6 +54,7 @@ rules:
     - get
     - list
     - watch
+    - update
   - 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.0-31f5433
+  image: fluidcloudnative/fluid-crd-upgrader:v1.0.1-84d04ae
 
 ##  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-31f5433
+    image: fluidcloudnative/dataset-controller:v1.0.1-84d04ae
 
 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-31f5433
+    image: fluidcloudnative/fluid-csi:v1.0.1-84d04ae
   kubelet:
     kubeConfigFile: /etc/kubernetes/kubelet.conf
     certDir: /var/lib/kubelet/pki
@@ -63,7 +63,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/alluxioruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/alluxioruntime-controller:v1.0.1-84d04ae
     runtime:
       image: alluxio/alluxio-dev:2.9.0
     fuse:
@@ -84,7 +84,7 @@ runtime:
     fuse:
       image: registry.cn-shanghai.aliyuncs.com/jindofs/jindo-fuse:6.2.0
     controller:
-      image: fluidcloudnative/jindoruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/jindoruntime-controller:v1.0.1-84d04ae
     init:
       portCheck:
         enabled: false
@@ -100,7 +100,7 @@ runtime:
     init:
       image: fluidcloudnative/init-users:v0.9.0
     controller:
-      image: fluidcloudnative/goosefsruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/goosefsruntime-controller:v1.0.1-84d04ae
     runtime:
       image: ccr.ccs.tencentyun.com/qcloud/goosefs:v1.2.0
     fuse:
@@ -112,7 +112,7 @@ runtime:
     enabled: false
     runtimeWorkers: 3
     controller:
-      image: fluidcloudnative/juicefsruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/juicefsruntime-controller:v1.0.1-84d04ae
     fuse:
       ceimage: juicedata/juicefs-fuse:ce-v1.1.0-rc1
       eeimage: juicedata/juicefs-fuse:ee-4.9.16
@@ -122,7 +122,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/thinruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/thinruntime-controller:v1.0.1-84d04ae
     fuse:
       configStorage: configmap
   efc:
@@ -131,7 +131,7 @@ runtime:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/efcruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/efcruntime-controller:v1.0.1-84d04ae
       imagePullPolicy: Always
     init:
       image: registry.cn-zhangjiakou.aliyuncs.com/nascache/init-alifuse:v1.2.2-19dcee9
@@ -143,11 +143,12 @@ runtime:
       image: registry.cn-zhangjiakou.aliyuncs.com/nascache/efc-fuse:v1.2.2-19dcee9
   vineyard:
     replicas: 1
+    portRange: 32000-34000
     tolerations:
       - operator: Exists
     enabled: false
     controller:
-      image: fluidcloudnative/vineyardruntime-controller:v1.0.0-31f5433
+      image: fluidcloudnative/vineyardruntime-controller:v1.0.1-84d04ae
       imagePullPolicy: Always
     master:
       image: bitnami/etcd:3.5.10
@@ -158,7 +159,7 @@ runtime:
 
 webhook:
   enabled: true
-  image: fluidcloudnative/fluid-webhook:v1.0.0-31f5433
+  image: fluidcloudnative/fluid-webhook:v1.0.1-84d04ae
   replicas: 1
   timeoutSeconds: 15
   reinvocationPolicy: IfNeeded
@@ -208,4 +209,4 @@ fluidapp:
   tolerations:
     - operator: Exists
   controller:
-    image: fluidcloudnative/application-controller:v1.0.0-31f5433
+    image: fluidcloudnative/application-controller:v1.0.1-84d04ae
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ rules: @@
         - get
         - list
         - watch
+        - update
       - apiGroups:
         - ""
         resources:
@@ Expand Down @@