github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #42105 from ncdc/use-storage-v1beta1-in-e2e" 

This reverts commit 59735fb908, reversing
changes made to 197bd532a2.
pull/6/head
Jordan Liggitt 2017-02-25 22:34:58 -05:00
parent 59735fb908
commit ce79526e37
No known key found for this signature in database
GPG Key ID: 24E7ADF9A3B42012
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/BUILD
View File

@ -121,7 +121,6 @@ go_library(
"//pkg/apis/storage/util:go_default_library", "//pkg/apis/storage/util:go_default_library",
"//pkg/apis/storage/v1:go_default_library", "//pkg/apis/storage/v1:go_default_library",
"//pkg/apis/storage/v1/util: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:go_default_library",
"//pkg/client/clientset_generated/clientset/typed/core/v1: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", "//pkg/client/clientset_generated/clientset/typed/extensions/v1beta1:go_default_library",

17
test/e2e/volume_provisioning.go
View File

@ -27,8 +27,8 @@ import (
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" 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" 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/pkg/client/clientset_generated/clientset"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
@ -111,9 +111,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass") By("creating a StorageClass")
class := newStorageClass("", "internal") class := newStorageClass("", "internal")
// TODO change to StorageV1 once it's enabled in GKE _, 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")
@ -171,9 +170,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}
// TODO change to StorageV1 once it's enabled in GKE 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")
@ -227,9 +225,8 @@ var _ = framework.KubeDescribe("Dynamic provisioning", func() {
By("creating a StorageClass") By("creating a StorageClass")
class := newStorageClass(externalPluginName, "external") class := newStorageClass(externalPluginName, "external")
// TODO change to StorageV1 once it's enabled in GKE _, 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")