mirror of https://github.com/k3s-io/k3s
Keep using storage v1beta1 until GKE enables it
parent
197bd532a2
commit
0e6ca8e514
|
@ -121,6 +121,7 @@ go_library(
|
|||
"//pkg/apis/storage/util:go_default_library",
|
||||
"//pkg/apis/storage/v1:go_default_library",
|
||||
"//pkg/apis/storage/v1/util:go_default_library",
|
||||
"//pkg/apis/storage/v1beta1:go_default_library",
|
||||
"//pkg/client/clientset_generated/clientset:go_default_library",
|
||||
"//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
|
||||
"//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",
|
||||
|
|
|
@ -27,8 +27,8 @@ import (
|
|||
|
||||
"k8s.io/kubernetes/pkg/api/v1"
|
||||
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
|
||||
storage "k8s.io/kubernetes/pkg/apis/storage/v1"
|
||||
storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
|
||||
storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1"
|
||||
"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
|
||||
"k8s.io/kubernetes/test/e2e/framework"
|
||||
|
||||
|
@ -111,8 +111,9 @@ 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)
|
||||
// TODO change to StorageV1 once it's enabled in GKE
|
||||
_, 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")
|
||||
|
@ -170,8 +171,9 @@ 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())
|
||||
// TODO change to StorageV1 once it's enabled in GKE
|
||||
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")
|
||||
|
@ -225,8 +227,9 @@ 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)
|
||||
// TODO change to StorageV1 once it's enabled in GKE
|
||||
_, 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")
|
||||
|
|
Loading…
Reference in New Issue