From a6b9e71b10e7e8c3ad08ded464a74dfa004ad88f Mon Sep 17 00:00:00 2001
From: Julie Qi <lizhuqi@google.com>
Date: Thu, 6 Jan 2022 14:17:47 -0800
Subject: [PATCH] Move readonly from dev to base

---
 .../base/controller/controller.yaml           |  1 +
 .../images/stable-master/image.yaml           |  2 +-
 .../overlays/dev/controller_readonly.yaml     | 20 -------------------
 .../overlays/dev/kustomization.yaml           |  1 -
 4 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 deploy/kubernetes/overlays/dev/controller_readonly.yaml

diff --git a/deploy/kubernetes/base/controller/controller.yaml b/deploy/kubernetes/base/controller/controller.yaml
index ffb2f83e7..93e8b92c2 100644
--- 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
index ce5390b5d..70f200bda 100644
--- 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
deleted file mode 100644
index 7ff125cfd..000000000
--- a/deploy/kubernetes/overlays/dev/controller_readonly.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: csi-gce-pd-controller
-spec:
-  template:
-    spec:
-      containers:
-        - name: csi-provisioner
-          args:
-            - "--v=5"
-            - "--csi-address=/csi/csi.sock"
-            - "--feature-gates=Topology=true"
-            - "--http-endpoint=:22011"
-            - "--leader-election-namespace=$(PDCSI_NAMESPACE)"
-            - "--timeout=250s"
-            - "--extra-create-metadata"
-            - "--leader-election"
-            - "--default-fstype=ext4"
-            - "--controller-publish-readonly=true"
diff --git a/deploy/kubernetes/overlays/dev/kustomization.yaml b/deploy/kubernetes/overlays/dev/kustomization.yaml
index 5ae08def4..2db58d45f 100644
--- 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/