From b34ad7e8ad3121f300672f61749f382373805584 Mon Sep 17 00:00:00 2001
From: Michelle Au <msau@google.com>
Date: Tue, 5 May 2020 14:56:12 -0700
Subject: [PATCH] Update sidecars for csi mock driver

Change-Id: Ica8ca20404fd15dcfdbb912602934a5b9f24e4c6
---
 .../testing-manifests/storage-csi/external-attacher/rbac.yaml  | 3 +++
 .../storage-csi/mock/csi-mock-driver-attacher.yaml             | 2 +-
 .../testing-manifests/storage-csi/mock/csi-mock-driver.yaml    | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml b/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml
index f5d97a11734..4d6dd506ce1 100644
--- a/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml
+++ b/test/e2e/testing-manifests/storage-csi/external-attacher/rbac.yaml
@@ -34,6 +34,9 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
     verbs: ["get", "list", "watch", "update", "patch"]
+  - apiGroups: ["storage.k8s.io"]
+    resources: ["volumeattachments/status"]
+    verbs: ["patch"]
 #Secret permission is optional.
 #Enable it if you need value from secret.
 #For example, you have key `csi.storage.k8s.io/controller-publish-secret-name` in StorageClass.parameters
diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml
index 7de61ea680a..65136a9404e 100644
--- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml
+++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver-attacher.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: csi-mock
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v2.1.0
+          image: quay.io/k8scsi/csi-attacher:v3.0.0-rc1
           args:
             - --v=5
             - --csi-address=$(ADDRESS)
diff --git a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
index 18b30b99288..d713e0d6fa5 100644
--- a/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
+++ b/test/e2e/testing-manifests/storage-csi/mock/csi-mock-driver.yaml
@@ -15,10 +15,9 @@ spec:
       serviceAccountName: csi-mock
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v1.6.0
+          image: quay.io/k8scsi/csi-provisioner:v2.0.0-rc1
           args:
             - "--csi-address=$(ADDRESS)"
-            - "--connection-timeout=15s"
             # Topology support is needed for the pod rescheduling test
             # ("storage capacity" in csi_mock_volume.go).
             - "--feature-gates=Topology=true"