Merge pull request #887 from lizhuqi/readonly-cp

Cherry Pick #886 [Move readonly from dev to base] to release-1.4
kubernetes-sigs · Jan 8, 2022 · aadc8d2 · aadc8d2
2 parents d8cad55 + a6b9e71
commit aadc8d2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml
@@ -36,6 +36,7 @@ spec:
           # - "--run-node-service=false"        # disable the node service of the CSI driver
             - "--leader-election"
             - "--default-fstype=ext4"
+            - "--controller-publish-readonly=true"
           env:
             - name: PDCSI_NAMESPACE
               valueFrom:

diff --git a/deploy/kubernetes/images/stable-master/image.yaml b/deploy/kubernetes/images/stable-master/image.yaml
@@ -4,7 +4,7 @@ metadata:
   name: imagetag-csi-provisioner
 imageTag:
   name: k8s.gcr.io/sig-storage/csi-provisioner
-  newTag: "v2.2.1"
+  newTag: "v3.0.0"
 
 ---
 apiVersion: builtin

diff --git a/deploy/kubernetes/overlays/dev/controller_readonly.yaml b/deploy/kubernetes/overlays/dev/controller_readonly.yaml
diff --git a/deploy/kubernetes/overlays/dev/kustomization.yaml b/deploy/kubernetes/overlays/dev/kustomization.yaml
@@ -3,7 +3,6 @@ kind: Kustomization
 patchesStrategicMerge:
 - controller_always_pull.yaml
 - node_always_pull.yaml
-- controller_readonly.yaml
 namespace: gce-pd-csi-driver
 resources:
 - ../../base/