fix: add pv patch permission with HonorPVReclaimPolicy enabled

fix fix
kubernetes-csi · Jul 29, 2024 · 362a8a5 · 362a8a5
1 parent e30c443
commit 362a8a5
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 7 deletions.
diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -64,7 +64,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=false"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/charts/latest/csi-driver-smb/templates/rbac-csi-smb.yaml b/charts/latest/csi-driver-smb/templates/rbac-csi-smb.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/v1.15.0/csi-driver-smb-v1.15.0.tgz b/charts/v1.15.0/csi-driver-smb-v1.15.0.tgz
diff --git a/charts/v1.15.0/csi-driver-smb/templates/csi-smb-controller.yaml b/charts/v1.15.0/csi-driver-smb/templates/csi-smb-controller.yaml
@@ -64,7 +64,7 @@ spec:
             - "--leader-election"
             - "--leader-election-namespace={{ .Release.Namespace }}"
             - "--extra-create-metadata=true"
-            - "--feature-gates=HonorPVReclaimPolicy=false"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/charts/v1.15.0/csi-driver-smb/templates/rbac-csi-smb.yaml b/charts/v1.15.0/csi-driver-smb/templates/rbac-csi-smb.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-smb-controller.yaml b/deploy/csi-smb-controller.yaml
@@ -41,6 +41,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--extra-create-metadata=true"
           env:
             - name: ADDRESS

diff --git a/deploy/rbac-csi-smb.yaml b/deploy/rbac-csi-smb.yaml
@@ -18,7 +18,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/v1.14.0/rbac-csi-smb.yaml b/deploy/v1.14.0/rbac-csi-smb.yaml
@@ -18,7 +18,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/v1.15.0/csi-smb-controller.yaml b/deploy/v1.15.0/csi-smb-controller.yaml
@@ -41,6 +41,7 @@ spec:
             - "--csi-address=$(ADDRESS)"
             - "--leader-election"
             - "--leader-election-namespace=kube-system"
+            - "--feature-gates=HonorPVReclaimPolicy=true"
             - "--extra-create-metadata=true"
           env:
             - name: ADDRESS

diff --git a/deploy/v1.15.0/rbac-csi-smb.yaml b/deploy/v1.15.0/rbac-csi-smb.yaml
@@ -18,7 +18,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"]