From 348a02395d4da6404b3da924b1903e9fd0fff748 Mon Sep 17 00:00:00 2001
From: Serguei Bezverkhi <sbezverk@cisco.com>
Date: Sat, 17 Feb 2018 12:58:51 -0500
Subject: [PATCH] Fixing CSI E2E test

---
 pkg/volume/csi/csi_client_test.go  |  1 +
 pkg/volume/csi/csi_plugin.go       |  2 +-
 pkg/volume/csi/fake/fake_client.go |  1 +
 test/e2e/storage/csi_volumes.go    | 21 +++++++++++----------
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkg/volume/csi/csi_client_test.go b/pkg/volume/csi/csi_client_test.go
index 7f44afc07b3..566b111e7be 100644
--- a/pkg/volume/csi/csi_client_test.go
+++ b/pkg/volume/csi/csi_client_test.go
@@ -49,6 +49,7 @@ func TestClientAssertSupportedVersion(t *testing.T) {
 		{testName: "supported version", ver: &csipb.Version{Major: 0, Minor: 0, Patch: 0}},
 		{testName: "supported version", ver: &csipb.Version{Major: 0, Minor: 1, Patch: 0}},
 		{testName: "supported version", ver: &csipb.Version{Major: 0, Minor: 1, Patch: 10}},
+		{testName: "supported version", ver: &csipb.Version{Major: 0, Minor: 2, Patch: 0}},
 		{testName: "supported version", ver: &csipb.Version{Major: 1, Minor: 1, Patch: 0}},
 		{testName: "supported version", ver: &csipb.Version{Major: 1, Minor: 0, Patch: 10}},
 		{testName: "unsupported version", ver: &csipb.Version{Major: 10, Minor: 0, Patch: 0}, mustFail: true},
diff --git a/pkg/volume/csi/csi_plugin.go b/pkg/volume/csi/csi_plugin.go
index f600d11ab03..b258d0b44e9 100644
--- a/pkg/volume/csi/csi_plugin.go
+++ b/pkg/volume/csi/csi_plugin.go
@@ -46,7 +46,7 @@ const (
 
 var (
 	// csiVersion supported csi version
-	csiVersion = &csipb.Version{Major: 0, Minor: 1, Patch: 0}
+	csiVersion = &csipb.Version{Major: 0, Minor: 2, Patch: 0}
 )
 
 type csiPlugin struct {
diff --git a/pkg/volume/csi/fake/fake_client.go b/pkg/volume/csi/fake/fake_client.go
index 2e0788e929a..91e09244423 100644
--- a/pkg/volume/csi/fake/fake_client.go
+++ b/pkg/volume/csi/fake/fake_client.go
@@ -53,6 +53,7 @@ func (f *IdentityClient) GetSupportedVersions(ctx grpctx.Context, req *csipb.Get
 		SupportedVersions: []*csipb.Version{
 			{Major: 0, Minor: 0, Patch: 1},
 			{Major: 0, Minor: 1, Patch: 0},
+			{Major: 0, Minor: 2, Patch: 0},
 			{Major: 1, Minor: 0, Patch: 0},
 			{Major: 1, Minor: 0, Patch: 1},
 			{Major: 1, Minor: 1, Patch: 1},
diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go
index b6aad07376d..1ab1299252f 100644
--- a/test/e2e/storage/csi_volumes.go
+++ b/test/e2e/storage/csi_volumes.go
@@ -39,7 +39,7 @@ const (
 	csiDriverRegistrarImage     string = "quay.io/k8scsi/driver-registrar:v0.2.0"
 )
 
-func externalAttacherServiceAccount(
+func csiServiceAccount(
 	client clientset.Interface,
 	config framework.VolumeTestConfig,
 	teardown bool,
@@ -71,7 +71,7 @@ func externalAttacherServiceAccount(
 	return ret
 }
 
-func externalAttacherClusterRole(
+func csiClusterRole(
 	client clientset.Interface,
 	config framework.VolumeTestConfig,
 	teardown bool,
@@ -89,7 +89,7 @@ func externalAttacherClusterRole(
 			},
 			{
 				APIGroups: []string{""},
-				Resources: []string{"persistentvolumesclaims"},
+				Resources: []string{"persistentvolumeclaims"},
 				Verbs:     []string{"get", "list", "watch", "update"},
 			},
 			{
@@ -129,7 +129,7 @@ func externalAttacherClusterRole(
 	return ret
 }
 
-func externalAttacherClusterRoleBinding(
+func csiClusterRoleBinding(
 	client clientset.Interface,
 	config framework.VolumeTestConfig,
 	teardown bool,
@@ -211,18 +211,18 @@ var _ = utils.SIGDescribe("CSI Volumes [Feature:CSI]", func() {
 
 		BeforeEach(func() {
 			By("deploying csi hostpath driver")
-			clusterRole = externalAttacherClusterRole(cs, config, false)
-			serviceAccount = externalAttacherServiceAccount(cs, config, false)
-			externalAttacherClusterRoleBinding(cs, config, false, serviceAccount, clusterRole)
+			clusterRole = csiClusterRole(cs, config, false)
+			serviceAccount = csiServiceAccount(cs, config, false)
+			csiClusterRoleBinding(cs, config, false, serviceAccount, clusterRole)
 			csiHostPathPod(cs, config, false, f, serviceAccount)
 		})
 
 		AfterEach(func() {
 			By("uninstalling csi hostpath driver")
 			csiHostPathPod(cs, config, true, f, serviceAccount)
-			externalAttacherClusterRoleBinding(cs, config, true, serviceAccount, clusterRole)
-			serviceAccount = externalAttacherServiceAccount(cs, config, true)
-			clusterRole = externalAttacherClusterRole(cs, config, true)
+			csiClusterRoleBinding(cs, config, true, serviceAccount, clusterRole)
+			serviceAccount = csiServiceAccount(cs, config, true)
+			clusterRole = csiClusterRole(cs, config, true)
 		})
 
 		It("should provision storage with a hostPath CSI driver", func() {
@@ -237,6 +237,7 @@ var _ = utils.SIGDescribe("CSI Volumes [Feature:CSI]", func() {
 
 			claim := newClaim(t, ns.GetName(), "")
 			class := newStorageClass(t, ns.GetName(), "")
+			claim.Spec.StorageClassName = &class.ObjectMeta.Name
 			testDynamicProvisioning(t, cs, claim, class)
 		})
 	})