From a56c5182922631942671971d5583815ac66ce15c Mon Sep 17 00:00:00 2001
From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 26 Oct 2018 20:47:15 +0200
Subject: [PATCH] e2e CSI: bump all containers to v0.4.1

---
 test/e2e/storage/csi_volumes.go                              | 5 +++--
 .../testing-manifests/storage-csi/gce-pd/controller_ss.yaml  | 4 ++--
 test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml   | 2 +-
 .../storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml | 2 +-
 .../hostpath/hostpath/csi-hostpath-provisioner.yaml          | 2 +-
 .../storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml    | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go
index 0579f0e162b..d8cbc6dd2e7 100644
--- a/test/e2e/storage/csi_volumes.go
+++ b/test/e2e/storage/csi_volumes.go
@@ -384,8 +384,9 @@ func initCSIgcePD(f *framework.Framework, config framework.VolumeTestConfig) csi
 
 func (g *gcePDCSIDriver) createStorageClassTest() testsuites.StorageClassTest {
 	return testsuites.StorageClassTest{
-		Name:         "com.google.csi.gcepd",
-		Provisioner:  "com.google.csi.gcepd-" + g.f.UniqueName,
+		Name: "com.google.csi.gcepd",
+		// *Not* renaming the driver, see below.
+		Provisioner:  "com.google.csi.gcepd",
 		Parameters:   map[string]string{"type": "pd-standard"},
 		ClaimSize:    "5Gi",
 		ExpectedSize: "5Gi",
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 8ab7d101931..078978afe33 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
@@ -17,7 +17,7 @@ spec:
       containers:
         - name: csi-external-provisioner
           imagePullPolicy: Always
-          image: quay.io/k8scsi/csi-provisioner:v0.2.0
+          image: quay.io/k8scsi/csi-provisioner:v0.4.1
           args:
             - "--v=5"
             - "--provisioner=com.google.csi.gcepd"
@@ -27,7 +27,7 @@ spec:
               mountPath: /csi
         - name: csi-attacher
           imagePullPolicy: Always
-          image: quay.io/k8scsi/csi-attacher:v0.2.0
+          image: quay.io/k8scsi/csi-attacher:v0.4.1
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
diff --git a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
index 5a67f8356f9..07a8bbe8f3d 100644
--- a/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
+++ b/test/e2e/testing-manifests/storage-csi/gce-pd/node_ds.yaml
@@ -16,7 +16,7 @@ spec:
       containers:
         - name: csi-driver-registrar
           imagePullPolicy: Always
-          image: quay.io/k8scsi/driver-registrar:v0.3.0
+          image: quay.io/k8scsi/driver-registrar:v0.4.1
           args:
             - "--v=5"
             - "--csi-address=/csi/csi.sock"
diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml
index 5af47dc6e2a..6fe198bd3ab 100644
--- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml
+++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-attacher.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: csi-attacher
       containers:
         - name: csi-attacher
-          image: quay.io/k8scsi/csi-attacher:v0.4.0
+          image: quay.io/k8scsi/csi-attacher:v0.4.1
           args:
             - --v=5
             - --csi-address=$(ADDRESS)
diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml
index b9191c12ffb..84b2c05baad 100644
--- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml
+++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpath-provisioner.yaml
@@ -30,7 +30,7 @@ spec:
       serviceAccountName: csi-provisioner
       containers:
         - name: csi-provisioner
-          image: quay.io/k8scsi/csi-provisioner:v0.4.0
+          image: quay.io/k8scsi/csi-provisioner:v0.4.1
           args:
             - "--provisioner=csi-hostpath"
             - "--csi-address=$(ADDRESS)"
diff --git a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml
index 1cd770ad99d..f7c326b4a87 100644
--- a/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml
+++ b/test/e2e/testing-manifests/storage-csi/hostpath/hostpath/csi-hostpathplugin.yaml
@@ -15,7 +15,7 @@ spec:
       hostNetwork: true
       containers:
         - name: driver-registrar
-          image: quay.io/k8scsi/driver-registrar:v0.4.0
+          image: quay.io/k8scsi/driver-registrar:v0.4.1
           args:
             - --v=5
             - --csi-address=/csi/csi.sock
@@ -33,7 +33,7 @@ spec:
           - mountPath: /registration
             name: registration-dir
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v0.4.0
+          image: quay.io/k8scsi/hostpathplugin:v0.4.1
           args:
             - "--v=5"
             - "--endpoint=$(CSI_ENDPOINT)"