Merge pull request #725 from andyzhangx/add-pv-patch-permission

fix: add pv patch permission with HonorPVReclaimPolicy enabled
kubernetes-csi · Jul 29, 2024 · e4a53ae · e4a53ae
2 parents 470dd76 + da0a676
commit e4a53ae
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 8 deletions.
diff --git a/charts/latest/csi-driver-nfs-v0.0.0.tgz b/charts/latest/csi-driver-nfs-v0.0.0.tgz
diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -60,7 +60,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=false"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--timeout=1200s"
           env:
             - name: ADDRESS

diff --git a/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml b/charts/latest/csi-driver-nfs/templates/rbac-csi-nfs.yaml
@@ -25,7 +25,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]

diff --git a/charts/v4.7.0/csi-driver-nfs-v4.7.0.tgz b/charts/v4.7.0/csi-driver-nfs-v4.7.0.tgz
diff --git a/charts/v4.7.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml b/charts/v4.7.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml
@@ -25,7 +25,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]

diff --git a/charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz b/charts/v4.8.0/csi-driver-nfs-v4.8.0.tgz
diff --git a/charts/v4.8.0/csi-driver-nfs/templates/csi-nfs-controller.yaml b/charts/v4.8.0/csi-driver-nfs/templates/csi-nfs-controller.yaml
@@ -60,7 +60,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=false"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--timeout=1200s"
           env:
             - name: ADDRESS

diff --git a/charts/v4.8.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml b/charts/v4.8.0/csi-driver-nfs/templates/rbac-csi-nfs.yaml
@@ -25,7 +25,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]

diff --git a/deploy/csi-nfs-controller.yaml b/deploy/csi-nfs-controller.yaml
@@ -42,6 +42,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
             - "--extra-create-metadata=true"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--timeout=1200s"
           env:
             - name: ADDRESS

diff --git a/deploy/rbac-csi-nfs.yaml b/deploy/rbac-csi-nfs.yaml
@@ -19,7 +19,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]

diff --git a/deploy/v4.7.0/rbac-csi-nfs.yaml b/deploy/v4.7.0/rbac-csi-nfs.yaml
@@ -19,7 +19,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]

diff --git a/deploy/v4.8.0/csi-nfs-controller.yaml b/deploy/v4.8.0/csi-nfs-controller.yaml
@@ -42,6 +42,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
             - "--extra-create-metadata=true"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--timeout=1200s"
           env:
             - name: ADDRESS

diff --git a/deploy/v4.8.0/rbac-csi-nfs.yaml b/deploy/v4.8.0/rbac-csi-nfs.yaml
@@ -19,7 +19,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["persistentvolumes"]
-    verbs: ["get", "list", "watch", "create", "delete"]
+    verbs: ["get", "list", "watch", "create", "patch", "delete"]
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]