From 9b9562837f22680ac8d20d24b27fbabce0ec5844 Mon Sep 17 00:00:00 2001
From: "Boyil (Elliot) Li" <boylee1111@gmail.com>
Date: Thu, 14 Nov 2019 10:57:17 -0800
Subject: [PATCH] update pd csi driver controller manifests

---
 .../storage-csi/gce-pd/controller_ss.yaml         |  2 +-
 .../storage-csi/gce-pd/csi-controller-rbac.yaml   | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
index c92beb8a84c..c05cb4a4dd2 100644
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/controller_ss.yaml
@@ -26,7 +26,7 @@ spec:
             - name: socket-dir
               mountPath: /csi
         - name: csi-provisioner
-          image: gcr.io/gke-release/csi-provisioner:v1.4.0-gke.0
+          image: quay.io/k8scsi/csi-provisioner:v1.5.0-rc1
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/csi-controller-rbac.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/csi-controller-rbac.yaml
index 92a8a6c3e8c..7757d756c97 100644
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/csi-controller-rbac.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/csi-controller-rbac.yaml
@@ -11,9 +11,6 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: csi-gce-pd-provisioner-role
 rules:
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
     verbs: ["get", "list", "watch", "create", "delete"]
@@ -48,7 +45,6 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-gce-pd-controller-sa
-    namespace: default
 roleRef:
   kind: ClusterRole
   name: csi-gce-pd-provisioner-role
@@ -83,7 +79,6 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-gce-pd-controller-sa
-    namespace: default
 roleRef:
   kind: ClusterRole
   name: csi-gce-pd-attacher-role
@@ -118,7 +113,6 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-gce-pd-controller-sa
-    namespace: default
 roleRef:
   kind: ClusterRole
   name: csi-gce-pd-resizer-role
@@ -134,18 +128,15 @@ rules:
   - apiGroups: [""]
     resources: ["events"]
     verbs: ["list", "watch", "create", "update", "patch"]
-  - apiGroups: [""]
-    resources: ["secrets"]
-    verbs: ["get", "list"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotclasses"]
     verbs: ["get", "list", "watch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
-    verbs: ["create", "get", "list", "watch", "update", "delete"]
+    verbs: ["get", "list", "watch", "update", "delete", "patch"]
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents/status"]
-    verbs: ["update"]
+    verbs: ["update", "patch"]
 
 ---
 kind: ClusterRoleBinding
@@ -155,7 +146,6 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-gce-pd-controller-sa
-    namespace: default
 roleRef:
   kind: ClusterRole
   name: csi-gce-pd-snapshotter-role
@@ -170,7 +160,6 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: csi-gce-pd-controller-sa
-    namespace: default
 roleRef:
   kind: ClusterRole
   name: e2e-test-privileged-psp