Repository: fluid-cloudnative/fluid
Pull request #3767 (2024-03-20 09:18:59)

Add the tag v0.21.5 for vineyard worker and vineyard fuse image.
### Ⅰ. Describe what this PR does

as titled.

fluid-e2e-bot[bot]: Hi @dashanji. Thanks for your PR.

I'm waiting for a [fluid-cloudnative](https://github.com/orgs/fluid-cloudnative/people) member to verify that this patch is reasonable to test. If it is, they should reply with `/ok-to-test` on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should [join the org](https://github.com/orgs/fluid-cloudnative/people) to skip this step.

Once the patch is verified, the new status will be reflected by the `ok-to-test` label.

I understand the commands that are listed [here](https://go.k8s.io/bot-commands?repo=fluid-cloudnative%2Ffluid).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

codecov[bot]: ## [Codecov](https://app.codecov.io/gh/fluid-cloudnative/fluid/pull/3767?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=fluid-cloudnative) Report
All modified and coverable lines are covered by tests :white_check_mark:
> Project coverage is 64.28%. Comparing base [(`4ca5767`)](https://app.codecov.io/gh/fluid-cloudnative/fluid/commit/4ca57673ee1c3380d7a9999f58c4532e6cba54a1?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=fluid-cloudnative) to head [(`7ab433b`)](https://app.codecov.io/gh/fluid-cloudnative/fluid/pull/3767?dropdown=coverage&src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=fluid-cloudnative).


<details><summary>Additional details and impacted files</summary>


```diff
@@           Coverage Diff           @@
##           master    #3767   +/-   ##
=======================================
  Coverage   64.28%   64.28%           
=======================================
  Files         476      476           
  Lines       28306    28306           
=======================================
  Hits        18197    18197           
  Misses       7945     7945           
  Partials     2164     2164           
```



</details>

[:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/fluid-cloudnative/fluid/pull/3767?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=fluid-cloudnative).   
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=fluid-cloudnative).

sonarcloud[bot]: ## [![Quality Gate Passed](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/checks/QualityGateBadge/qg-passed-20px.png 'Quality Gate Passed')](https://sonarcloud.io/dashboard?id=fluid-cloudnative_fluid&pullRequest=3767) **Quality Gate passed**  
Issues  
![](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/passed-16px.png '') [0 New issues](https://sonarcloud.io/project/issues?id=fluid-cloudnative_fluid&pullRequest=3767&resolved=false&inNewCodePeriod=true)  
![](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/accepted-16px.png '') [0 Accepted issues](https://sonarcloud.io/component_measures?id=fluid-cloudnative_fluid&pullRequest=3767&metric=new_accepted_issues&view=list)

Measures  
![](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/passed-16px.png '') [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=fluid-cloudnative_fluid&pullRequest=3767&resolved=false&inNewCodePeriod=true)  
![](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/no-data-16px.png '') No data about Coverage  
![](https://sonarsource.github.io/sonarcloud-github-static-resources/v2/common/passed-16px.png '') [19.6% Duplication on New Code](https://sonarcloud.io/component_measures?id=fluid-cloudnative_fluid&pullRequest=3767&metric=new_duplicated_lines_density&view=list)  
  
[See analysis details on SonarCloud](https://sonarcloud.io/dashboard?id=fluid-cloudnative_fluid&pullRequest=3767)



Patch:
diff --git a/api/v1alpha1/openapi_generated.go b/api/v1alpha1/openapi_generated.go
index 176372bc..4e3d0c43 100644
--- a/api/v1alpha1/openapi_generated.go
+++ b/api/v1alpha1/openapi_generated.go
@@ -4501,7 +4501,7 @@ func schema_fluid_cloudnative_fluid_api_v1alpha1_MasterSpec(ref common.Reference
 					},
 					"imageTag": {
 						SchemaProps: spec.SchemaProps{
-							Description: "The image tag of Vineyard component. For Master, the default image tag is `3.5.10`. For Worker, the default image tag is `latest`.",
+							Description: "The image tag of Vineyard component. For Master, the default image tag is `3.5.10`. For Worker, the default image tag is `v0.21.5`.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
@@ -6413,7 +6413,7 @@ func schema_fluid_cloudnative_fluid_api_v1alpha1_VineyardCompTemplateSpec(ref co
 					},
 					"imageTag": {
 						SchemaProps: spec.SchemaProps{
-							Description: "The image tag of Vineyard component. For Master, the default image tag is `3.5.10`. For Worker, the default image tag is `latest`.",
+							Description: "The image tag of Vineyard component. For Master, the default image tag is `3.5.10`. For Worker, the default image tag is `v0.21.5`.",
 							Type:        []string{"string"},
 							Format:      "",
 						},
@@ -6701,7 +6701,7 @@ func schema_fluid_cloudnative_fluid_api_v1alpha1_VineyardSockSpec(ref common.Ref
 					},
 					"imageTag": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Image Tag for Vineyard Fuse Default is `latest`",
+							Description: "Image Tag for Vineyard Fuse Default is `v0.21.5`",
 							Type:        []string{"string"},
 							Format:      "",
 						},
diff --git a/api/v1alpha1/vineyardruntime_types.go b/api/v1alpha1/vineyardruntime_types.go
index 004a8ae5..659fbb81 100644
--- a/api/v1alpha1/vineyardruntime_types.go
+++ b/api/v1alpha1/vineyardruntime_types.go
@@ -38,7 +38,7 @@ type VineyardCompTemplateSpec struct {
 
 	// The image tag of Vineyard component.
 	// For Master, the default image tag is `3.5.10`.
-	// For Worker, the default image tag is `latest`.
+	// For Worker, the default image tag is `v0.21.5`.
 	// +optional
 	ImageTag string `json:"imageTag,omitempty"`
 
@@ -147,7 +147,7 @@ type VineyardSockSpec struct {
 	Image string `json:"image,omitempty"`
 
 	// Image Tag for Vineyard Fuse
-	// Default is `latest`
+	// Default is `v0.21.5`
 	// +optional
 	ImageTag string `json:"imageTag,omitempty"`
 
diff --git a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
index f049fe62..1ecd7d60 100644
--- a/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
+++ b/charts/fluid/fluid/crds/data.fluid.io_vineyardruntimes.yaml
@@ -114,7 +114,7 @@ spec:
                       Available values are `Always`, `IfNotPresent`, `Never`
                     type: string
                   imageTag:
-                    description: Image Tag for Vineyard Fuse Default is `latest`
+                    description: Image Tag for Vineyard Fuse Default is `v0.21.5`
                     type: string
                   resources:
                     description: Resources contains the resource requirements and
@@ -217,7 +217,7 @@ spec:
                   imageTag:
                     description: The image tag of Vineyard component. For Master,
                       the default image tag is `3.5.10`. For Worker, the default image
-                      tag is `latest`.
+                      tag is `v0.21.5`.
                     type: string
                   nodeSelector:
                     additionalProperties:
@@ -3505,7 +3505,7 @@ spec:
                   imageTag:
                     description: The image tag of Vineyard component. For Master,
                       the default image tag is `3.5.10`. For Worker, the default image
-                      tag is `latest`.
+                      tag is `v0.21.5`.
                     type: string
                   nodeSelector:
                     additionalProperties:
diff --git a/charts/vineyard/Chart.yaml b/charts/vineyard/Chart.yaml
index 4fb684df..0e058b6f 100644
--- a/charts/vineyard/Chart.yaml
+++ b/charts/vineyard/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 0.19.3
+version: 0.21.5
 description: an In-Memory Data Manager for Data-Intensive Analytics
 home: https://v6d.io/
 keywords:
diff --git a/charts/vineyard/values.yaml b/charts/vineyard/values.yaml
index afb4b48a..36dac388 100644
--- a/charts/vineyard/values.yaml
+++ b/charts/vineyard/values.yaml
@@ -46,7 +46,7 @@ master:
 worker:
   replicas: 1
   image: vineyardcloudnative/vineyardd
-  imageTag: latest
+  imageTag: v0.21.5
   imagePullPolicy: IfNotPresent
   nodeSelector: {}
   # Exmaple:
@@ -97,7 +97,7 @@ disablePrometheus: true
 
 fuse:
   image: vineyardcloudnative/vineyard-fluid-fuse
-  imageTag: latest
+  imageTag: v0.21.5
   imagePullPolicy: IfNotPresent
   env: {}
   targetPath: ""
diff --git a/config/crd/bases/data.fluid.io_vineyardruntimes.yaml b/config/crd/bases/data.fluid.io_vineyardruntimes.yaml
index f049fe62..1ecd7d60 100644
--- a/config/crd/bases/data.fluid.io_vineyardruntimes.yaml
+++ b/config/crd/bases/data.fluid.io_vineyardruntimes.yaml
@@ -114,7 +114,7 @@ spec:
                       Available values are `Always`, `IfNotPresent`, `Never`
                     type: string
                   imageTag:
-                    description: Image Tag for Vineyard Fuse Default is `latest`
+                    description: Image Tag for Vineyard Fuse Default is `v0.21.5`
                     type: string
                   resources:
                     description: Resources contains the resource requirements and
@@ -217,7 +217,7 @@ spec:
                   imageTag:
                     description: The image tag of Vineyard component. For Master,
                       the default image tag is `3.5.10`. For Worker, the default image
-                      tag is `latest`.
+                      tag is `v0.21.5`.
                     type: string
                   nodeSelector:
                     additionalProperties:
@@ -3505,7 +3505,7 @@ spec:
                   imageTag:
                     description: The image tag of Vineyard component. For Master,
                       the default image tag is `3.5.10`. For Worker, the default image
-                      tag is `latest`.
+                      tag is `v0.21.5`.
                     type: string
                   nodeSelector:
                     additionalProperties:
diff --git a/config/fluid/bases/csi-plugin.yaml b/config/fluid/bases/csi-plugin.yaml
index 6aecb853..e535be50 100644
--- a/config/fluid/bases/csi-plugin.yaml
+++ b/config/fluid/bases/csi-plugin.yaml
@@ -18,7 +18,7 @@ spec:
       - operator: Exists
       #priorityClassName: system-node-critical
       hostNetwork: true
-      hostPID: true
+      hostPID: false
       containers:
         - name: node-driver-registrar
           image: {}
diff --git a/config/fluid/bases/csi/daemonset.yaml b/config/fluid/bases/csi/daemonset.yaml
index 62e8d197..8d542458 100644
--- a/config/fluid/bases/csi/daemonset.yaml
+++ b/config/fluid/bases/csi/daemonset.yaml
@@ -18,7 +18,7 @@ spec:
         - operator: Exists
       #priorityClassName: system-node-critical
       hostNetwork: true
-      hostPID: true
+      hostPID: false
       containers:
         - name: node-driver-registrar
           # image: <To be injected by patches/csi/injections_in_csi_plugin.yaml>
diff --git a/config/fluid/bases/role/alluxio/rbac.yaml b/config/fluid/bases/role/alluxio/rbac.yaml
index a8048ea4..2001f0df 100644
--- a/config/fluid/bases/role/alluxio/rbac.yaml
+++ b/config/fluid/bases/role/alluxio/rbac.yaml
@@ -19,7 +19,13 @@ rules:
       - secrets
       - nodes
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - data.fluid.io
     resources:
@@ -30,7 +36,13 @@ rules:
       - alluxioruntimes/status
       - datasets/status
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - apps
     resources:
@@ -39,7 +51,13 @@ rules:
       - daemonsets/status
       - statefulsets/status
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/config/fluid/bases/role/dataset/rbac.yaml b/config/fluid/bases/role/dataset/rbac.yaml
index 07538e30..94f243b3 100644
--- a/config/fluid/bases/role/dataset/rbac.yaml
+++ b/config/fluid/bases/role/dataset/rbac.yaml
@@ -10,7 +10,13 @@ rules:
        - jobs
        - jobs/status
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - ""
     resources:
@@ -26,7 +32,13 @@ rules:
       - secrets
       - nodes
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - data.fluid.io
     resources:
@@ -39,13 +51,25 @@ rules:
       - alluxioruntimes
       - alluxioruntimes/status
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
   - apiGroups:
       - ""
     resources:
       - events
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/docs/en/dev/api_doc.md b/docs/en/dev/api_doc.md
index 19349ca5..0a0e5578 100644
--- a/docs/en/dev/api_doc.md
+++ b/docs/en/dev/api_doc.md
@@ -9879,7 +9879,7 @@ string
 <em>(Optional)</em>
 <p>The image tag of Vineyard component.
 For Master, the default image tag is <code>3.5.10</code>.
-For Worker, the default image tag is <code>latest</code>.</p>
+For Worker, the default image tag is <code>v0.21.5</code>.</p>
 </td>
 </tr>
 <tr>
@@ -10177,7 +10177,7 @@ string
 <td>
 <em>(Optional)</em>
 <p>Image Tag for Vineyard Fuse
-Default is <code>latest</code></p>
+Default is <code>v0.21.5</code></p>
 </td>
 </tr>
 <tr>
@@ -10308,5 +10308,5 @@ bool
 <hr/>
 <p><em>
 Generated with <code>gen-crd-api-reference-docs</code>
-on git commit <code>b9800030e</code>.
+on git commit <code>4ca57673e</code>.
 </em></p>
diff --git a/docs/zh/dev/api_doc.md b/docs/zh/dev/api_doc.md
index 19349ca5..0a0e5578 100644
--- a/docs/zh/dev/api_doc.md
+++ b/docs/zh/dev/api_doc.md
@@ -9879,7 +9879,7 @@ string
 <em>(Optional)</em>
 <p>The image tag of Vineyard component.
 For Master, the default image tag is <code>3.5.10</code>.
-For Worker, the default image tag is <code>latest</code>.</p>
+For Worker, the default image tag is <code>v0.21.5</code>.</p>
 </td>
 </tr>
 <tr>
@@ -10177,7 +10177,7 @@ string
 <td>
 <em>(Optional)</em>
 <p>Image Tag for Vineyard Fuse
-Default is <code>latest</code></p>
+Default is <code>v0.21.5</code></p>
 </td>
 </tr>
 <tr>
@@ -10308,5 +10308,5 @@ bool
 <hr/>
 <p><em>
 Generated with <code>gen-crd-api-reference-docs</code>
-on git commit <code>b9800030e</code>.
+on git commit <code>4ca57673e</code>.
 </em></p>
diff --git a/integration/kubeflow/rbac.yaml b/integration/kubeflow/rbac.yaml
index 31339108..d4591987 100644
--- a/integration/kubeflow/rbac.yaml
+++ b/integration/kubeflow/rbac.yaml
@@ -11,7 +11,13 @@ rules:
       - alluxioruntimes
       - alluxioruntimes/status
     verbs:
-      - '*'
+      - get
+      - list
+      - watch
+      - create
+      - update
+      - patch
+      - delete
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
diff --git a/pkg/common/vineyard.go b/pkg/common/vineyard.go
index 0cff57c1..cbf0d336 100644
--- a/pkg/common/vineyard.go
+++ b/pkg/common/vineyard.go
@@ -25,9 +25,9 @@ const (
 
 	DefaultVineyardMasterImage = "bitnami/etcd:3.5.10"
 
-	DefaultVineyardWorkerImage = "vineyardcloudnative/vineyardd:latest"
+	DefaultVineyardWorkerImage = "vineyardcloudnative/vineyardd:v0.21.5"
 
-	DefultVineyardFuseImage = "vineyardcloudnative/vineyard-fluid-fuse:latest"
+	DefultVineyardFuseImage = "vineyardcloudnative/vineyard-fluid-fuse:v0.21.5"
 
 	VineyardEngineImpl = VineyardRuntime
 )


Test patch:
diff --git a/pkg/ddc/vineyard/utils_test.go b/pkg/ddc/vineyard/utils_test.go
index 92c40127..2d19d1b2 100644
--- a/pkg/ddc/vineyard/utils_test.go
+++ b/pkg/ddc/vineyard/utils_test.go
@@ -463,7 +463,7 @@ func TestParseWorkerImage(t *testing.T) {
 			imagePullPolicy: "",
 			engine:          &VineyardEngine{},
 			wantImage:       "vineyardcloudnative/vineyardd",
-			wantTag:         "latest",
+			wantTag:         "v0.21.5",
 			wantPolicy:      "IfNotPresent",
 		},
 	}
@@ -505,7 +505,7 @@ func TestParseFuseImage(t *testing.T) {
 			imagePullPolicy: "",
 			engine:          &VineyardEngine{},
 			wantImage:       "vineyardcloudnative/vineyard-fluid-fuse",
-			wantTag:         "latest",
+			wantTag:         "v0.21.5",
 			wantPolicy:      "IfNotPresent",
 		},
 	}