From a39bd5350968d76f003697f03648f99b0914302a Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Wed, 1 Mar 2017 22:09:09 +0100
Subject: [PATCH] Explicitly use storage.k8s.io/v1beta1 everywhere.

v1 is not yet awailable on GKE and tests would fail.
---
 pkg/volume/util/util.go                              |  2 +-
 test/e2e/volume_provisioning.go                      | 12 ++++++------
 .../storageclasses/storage_classes_test.go           |  4 ++--
 test/integration/volume/persistent_volumes_test.go   |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go
index 0112d394a7a..035b2f0609a 100644
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -158,7 +158,7 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume)
 		return nil, fmt.Errorf("Volume has no class annotation")
 	}
 
-	class, err := kubeClient.Storage().StorageClasses().Get(className, metav1.GetOptions{})
+	class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go
index cc0524c6f50..84f249aff23 100644
--- a/test/e2e/volume_provisioning.go
+++ b/test/e2e/volume_provisioning.go
@@ -110,8 +110,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
 
 			By("creating a StorageClass")
 			class := newStorageClass("", "internal")
-			_, err := c.Storage().StorageClasses().Create(class)
-			defer c.Storage().StorageClasses().Delete(class.Name, nil)
+			_, err := c.StorageV1beta1().StorageClasses().Create(class)
+			defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("creating a claim with a dynamic provisioning annotation")
@@ -169,8 +169,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
 			sc := newStorageClass("kubernetes.io/gce-pd", suffix)
 			// Set an unmanaged zone.
 			sc.Parameters = map[string]string{"zone": unmanagedZone}
-			sc, err = c.Storage().StorageClasses().Create(sc)
-			defer Expect(c.Storage().StorageClasses().Delete(sc.Name, nil)).To(Succeed())
+			sc, err = c.StorageV1beta1().StorageClasses().Create(sc)
+			defer Expect(c.StorageV1beta1().StorageClasses().Delete(sc.Name, nil)).To(Succeed())
 			Expect(err).NotTo(HaveOccurred())
 
 			By("Creating a claim and expecting it to timeout")
@@ -224,8 +224,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
 
 			By("creating a StorageClass")
 			class := newStorageClass(externalPluginName, "external")
-			_, err = c.Storage().StorageClasses().Create(class)
-			defer c.Storage().StorageClasses().Delete(class.Name, nil)
+			_, err = c.StorageV1beta1().StorageClasses().Create(class)
+			defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
 			Expect(err).NotTo(HaveOccurred())
 
 			By("creating a claim with a dynamic provisioning annotation")
diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go
index 681099204fc..cedf12c72cd 100644
--- a/test/integration/storageclasses/storage_classes_test.go
+++ b/test/integration/storageclasses/storage_classes_test.go
@@ -62,7 +62,7 @@ func DoTestStorageClasses(t *testing.T, client clientset.Interface, ns *v1.Names
 		Provisioner: provisionerPluginName,
 	}
 
-	if _, err := client.Storage().StorageClasses().Create(&s); err != nil {
+	if _, err := client.StorageV1beta1().StorageClasses().Create(&s); err != nil {
 		t.Errorf("unable to create test storage class: %v", err)
 	}
 	defer deleteStorageClassOrErrorf(t, client, s.Namespace, s.Name)
@@ -90,7 +90,7 @@ func DoTestStorageClasses(t *testing.T, client clientset.Interface, ns *v1.Names
 }
 
 func deleteStorageClassOrErrorf(t *testing.T, c clientset.Interface, ns, name string) {
-	if err := c.Storage().StorageClasses().Delete(name, nil); err != nil {
+	if err := c.StorageV1beta1().StorageClasses().Delete(name, nil); err != nil {
 		t.Errorf("unable to delete storage class %v: %v", name, err)
 	}
 }
diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go
index 218d3843a5e..e271e7dd27a 100644
--- a/test/integration/volume/persistent_volumes_test.go
+++ b/test/integration/volume/persistent_volumes_test.go
@@ -866,7 +866,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) {
 	// NOTE: This test cannot run in parallel, because it is creating and deleting
 	// non-namespaced objects (PersistenceVolumes and StorageClasses).
 	defer testClient.Core().PersistentVolumes().DeleteCollection(nil, metav1.ListOptions{})
-	defer testClient.Storage().StorageClasses().DeleteCollection(nil, metav1.ListOptions{})
+	defer testClient.StorageV1beta1().StorageClasses().DeleteCollection(nil, metav1.ListOptions{})
 
 	storageClass := storage.StorageClass{
 		TypeMeta: metav1.TypeMeta{
@@ -877,7 +877,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) {
 		},
 		Provisioner: provisionerPluginName,
 	}
-	testClient.Storage().StorageClasses().Create(&storageClass)
+	testClient.StorageV1beta1().StorageClasses().Create(&storageClass)
 
 	stopCh := make(chan struct{})
 	informers.Start(stopCh)