github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Explicitly use storage.k8s.io/v1beta1 everywhere.

Browse Source 
v1 is not yet awailable on GKE and tests would fail.
This commit is contained in:
Jan Safranek 2017-03-01 22:09:09 +01:00
parent 5f62491e22
commit a39bd53509
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/util/util.go
View File

@ -158,7 +158,7 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume)
return nil, fmt.Errorf("Volume has no class annotation") 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 { if err != nil {
return nil, err return nil, err
} }

12
test/e2e/volume_provisioning.go
View File

@ -110,8 +110,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass") By("creating a StorageClass")
class := newStorageClass("", "internal") class := newStorageClass("", "internal")
_, err := c.Storage().StorageClasses().Create(class) _, err := c.StorageV1beta1().StorageClasses().Create(class)
defer c.Storage().StorageClasses().Delete(class.Name, nil) defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("creating a claim with a dynamic provisioning annotation") 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) sc := newStorageClass("kubernetes.io/gce-pd", suffix)
// Set an unmanaged zone. // Set an unmanaged zone.
sc.Parameters = map[string]string{"zone": unmanagedZone} sc.Parameters = map[string]string{"zone": unmanagedZone}
sc, err = c.Storage().StorageClasses().Create(sc) sc, err = c.StorageV1beta1().StorageClasses().Create(sc)
defer Expect(c.Storage().StorageClasses().Delete(sc.Name, nil)).To(Succeed()) defer Expect(c.StorageV1beta1().StorageClasses().Delete(sc.Name, nil)).To(Succeed())
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("Creating a claim and expecting it to timeout") By("Creating a claim and expecting it to timeout")
@ -224,8 +224,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass") By("creating a StorageClass")
class := newStorageClass(externalPluginName, "external") class := newStorageClass(externalPluginName, "external")
_, err = c.Storage().StorageClasses().Create(class) _, err = c.StorageV1beta1().StorageClasses().Create(class)
defer c.Storage().StorageClasses().Delete(class.Name, nil) defer c.StorageV1beta1().StorageClasses().Delete(class.Name, nil)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
By("creating a claim with a dynamic provisioning annotation") By("creating a claim with a dynamic provisioning annotation")

4
test/integration/storageclasses/storage_classes_test.go
View File

@ -62,7 +62,7 @@ func DoTestStorageClasses(t *testing.T, client clientset.Interface, ns *v1.Names
Provisioner: provisionerPluginName, 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) t.Errorf("unable to create test storage class: %v", err)
} }
defer deleteStorageClassOrErrorf(t, client, s.Namespace, s.Name) 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) { 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) t.Errorf("unable to delete storage class %v: %v", name, err)
} }
} }

4
test/integration/volume/persistent_volumes_test.go
View File

@ -866,7 +866,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) {
// NOTE: This test cannot run in parallel, because it is creating and deleting // NOTE: This test cannot run in parallel, because it is creating and deleting
// non-namespaced objects (PersistenceVolumes and StorageClasses). // non-namespaced objects (PersistenceVolumes and StorageClasses).
defer testClient.Core().PersistentVolumes().DeleteCollection(nil, metav1.ListOptions{}) 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{ storageClass := storage.StorageClass{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
@ -877,7 +877,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) {
}, },
Provisioner: provisionerPluginName, Provisioner: provisionerPluginName,
} }
testClient.Storage().StorageClasses().Create(&storageClass) testClient.StorageV1beta1().StorageClasses().Create(&storageClass)
stopCh := make(chan struct{}) stopCh := make(chan struct{})
informers.Start(stopCh) informers.Start(stopCh)