From 9d0c47f1db85e943a9008aac489eacbb0ab15bb3 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 25 Apr 2017 10:13:38 +0200 Subject: [PATCH 1/2] Use storage.v1 instead of v1beta1 storage.v1beta1 was used to work around GKE which does not expose v1. Now that GKE is updated, we can switch everything to v1. --- cmd/kube-controller-manager/app/controllermanager.go | 2 +- pkg/apis/storage/install/install.go | 5 ++--- pkg/controller/volume/persistentvolume/BUILD | 10 +++++----- pkg/controller/volume/persistentvolume/binder_test.go | 2 +- pkg/controller/volume/persistentvolume/delete_test.go | 2 +- .../volume/persistentvolume/framework_test.go | 6 +++--- .../volume/persistentvolume/provision_test.go | 2 +- .../volume/persistentvolume/pv_controller.go | 4 ++-- .../volume/persistentvolume/pv_controller_base.go | 4 ++-- pkg/controller/volume/persistentvolume/recycle_test.go | 2 +- pkg/kubectl/cmd/util/shortcut_restmapper_test.go | 8 ++++---- pkg/volume/util/BUILD | 2 +- pkg/volume/util/util.go | 4 ++-- test/e2e/storage/vsphere_utils.go | 2 +- test/e2e/storage/vsphere_volume_diskformat.go | 4 ++-- test/e2e/storage/vsphere_volume_fstype.go | 4 ++-- test/e2e/storage/vsphere_volume_ops_storm.go | 6 +++--- test/integration/etcd/etcd_storage_path_test.go | 2 +- test/integration/framework/BUILD | 2 +- test/integration/framework/master_utils.go | 2 +- .../integration/storageclasses/storage_classes_test.go | 6 +++--- test/integration/volume/persistent_volumes_test.go | 8 ++++---- 22 files changed, 44 insertions(+), 45 deletions(-) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 5bfe8620dfd..264e9ad4041 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -539,7 +539,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root ClusterName: s.ClusterName, VolumeInformer: sharedInformers.Core().V1().PersistentVolumes(), ClaimInformer: sharedInformers.Core().V1().PersistentVolumeClaims(), - ClassInformer: sharedInformers.Storage().V1beta1().StorageClasses(), + ClassInformer: sharedInformers.Storage().V1().StorageClasses(), EnableDynamicProvisioning: s.VolumeConfiguration.EnableDynamicProvisioning, } volumeController, volumeControllerErr := persistentvolumecontroller.NewController(params) diff --git a/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go index 8ba3050dcf9..7b09a34d233 100644 --- a/pkg/apis/storage/install/install.go +++ b/pkg/apis/storage/install/install.go @@ -37,9 +37,8 @@ func init() { func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ - GroupName: storage.GroupName, - // TODO: change the order when GKE supports v1 - VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version, v1.SchemeGroupVersion.Version}, + GroupName: storage.GroupName, + VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, ImportPrefix: "k8s.io/kubernetes/pkg/apis/storage", RootScopedKinds: sets.NewString("StorageClass"), AddInternalObjectsToScheme: storage.AddToScheme, diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index a03482de4b8..4eb9a647ccf 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -22,12 +22,12 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/api/v1/helper:go_default_library", "//pkg/api/v1/ref:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", + "//pkg/apis/storage/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/informers/informers_generated/externalversions/core/v1:go_default_library", - "//pkg/client/informers/informers_generated/externalversions/storage/v1beta1:go_default_library", + "//pkg/client/informers/informers_generated/externalversions/storage/v1:go_default_library", "//pkg/client/listers/core/v1:go_default_library", - "//pkg/client/listers/storage/v1beta1:go_default_library", + "//pkg/client/listers/storage/v1:go_default_library", "//pkg/cloudprovider:go_default_library", "//pkg/controller:go_default_library", "//pkg/util/goroutinemap:go_default_library", @@ -69,11 +69,11 @@ go_test( "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", "//pkg/api/v1/ref:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", + "//pkg/apis/storage/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset/fake:go_default_library", "//pkg/client/informers/informers_generated/externalversions:go_default_library", - "//pkg/client/listers/storage/v1beta1:go_default_library", + "//pkg/client/listers/storage/v1:go_default_library", "//pkg/controller:go_default_library", "//pkg/volume:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/controller/volume/persistentvolume/binder_test.go b/pkg/controller/volume/persistentvolume/binder_test.go index 5a26deed51f..b9d91859d8c 100644 --- a/pkg/controller/volume/persistentvolume/binder_test.go +++ b/pkg/controller/volume/persistentvolume/binder_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" ) // Test single call to syncClaim and syncVolume methods. diff --git a/pkg/controller/volume/persistentvolume/delete_test.go b/pkg/controller/volume/persistentvolume/delete_test.go index 592c51ab941..0083dd0cd99 100644 --- a/pkg/controller/volume/persistentvolume/delete_test.go +++ b/pkg/controller/volume/persistentvolume/delete_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" ) // Test single call to syncVolume, expecting recycling to happen. diff --git a/pkg/controller/volume/persistentvolume/framework_test.go b/pkg/controller/volume/persistentvolume/framework_test.go index 019c44f7b23..e4f7dcf712e 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -42,11 +42,11 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" - storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1" + storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1" "k8s.io/kubernetes/pkg/controller" vol "k8s.io/kubernetes/pkg/volume" ) @@ -606,7 +606,7 @@ func newTestController(kubeClient clientset.Interface, informerFactory informers VolumePlugins: []vol.VolumePlugin{}, VolumeInformer: informerFactory.Core().V1().PersistentVolumes(), ClaimInformer: informerFactory.Core().V1().PersistentVolumeClaims(), - ClassInformer: informerFactory.Storage().V1beta1().StorageClasses(), + ClassInformer: informerFactory.Storage().V1().StorageClasses(), EventRecorder: record.NewFakeRecorder(1000), EnableDynamicProvisioning: enableDynamicProvisioning, } diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index 0f4fbb8f640..944f5dbe793 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" ) var class1Parameters = map[string]string{ diff --git a/pkg/controller/volume/persistentvolume/pv_controller.go b/pkg/controller/volume/persistentvolume/pv_controller.go index 9ab1639bcbe..0b336711dc6 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -30,10 +30,10 @@ import ( "k8s.io/kubernetes/pkg/api/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" "k8s.io/kubernetes/pkg/api/v1/ref" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" - storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1" + storagelisters "k8s.io/kubernetes/pkg/client/listers/storage/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/util/goroutinemap" "k8s.io/kubernetes/pkg/util/goroutinemap/exponentialbackoff" diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 6ffddec3c22..92adb059d5e 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -34,10 +34,10 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" - storageinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1beta1" + storageinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/storage/v1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/volume/persistentvolume/recycle_test.go b/pkg/controller/volume/persistentvolume/recycle_test.go index 8566a898c0a..356f6fc0539 100644 --- a/pkg/controller/volume/persistentvolume/recycle_test.go +++ b/pkg/controller/volume/persistentvolume/recycle_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" ) // Test single call to syncVolume, expecting recycling to happen. diff --git a/pkg/kubectl/cmd/util/shortcut_restmapper_test.go b/pkg/kubectl/cmd/util/shortcut_restmapper_test.go index 91527abb71a..689f06994ac 100644 --- a/pkg/kubectl/cmd/util/shortcut_restmapper_test.go +++ b/pkg/kubectl/cmd/util/shortcut_restmapper_test.go @@ -95,10 +95,10 @@ func TestKindFor(t *testing.T) { }{ { in: schema.GroupVersionResource{Group: "storage.k8s.io", Version: "", Resource: "sc"}, - expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1beta1", Kind: "StorageClass"}, + expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1", Kind: "StorageClass"}, srvRes: []*metav1.APIResourceList{ { - GroupVersion: "storage.k8s.io/v1beta1", + GroupVersion: "storage.k8s.io/v1", APIResources: []metav1.APIResource{ { Name: "storageclasses", @@ -110,10 +110,10 @@ func TestKindFor(t *testing.T) { }, { in: schema.GroupVersionResource{Group: "", Version: "", Resource: "sc"}, - expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1beta1", Kind: "StorageClass"}, + expected: schema.GroupVersionKind{Group: "storage.k8s.io", Version: "v1", Kind: "StorageClass"}, srvRes: []*metav1.APIResourceList{ { - GroupVersion: "storage.k8s.io/v1beta1", + GroupVersion: "storage.k8s.io/v1", APIResources: []metav1.APIResource{ { Name: "storageclasses", diff --git a/pkg/volume/util/BUILD b/pkg/volume/util/BUILD index 17cec4e22e1..30bc0164826 100644 --- a/pkg/volume/util/BUILD +++ b/pkg/volume/util/BUILD @@ -23,7 +23,7 @@ go_library( deps = [ "//pkg/api/v1:go_default_library", "//pkg/api/v1/helper:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", + "//pkg/apis/storage/v1:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/util/mount:go_default_library", "//vendor/github.com/golang/glog:go_default_library", diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index 10bec7f8294..97561e7e658 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/util/mount" ) @@ -158,7 +158,7 @@ func GetClassForVolume(kubeClient clientset.Interface, pv *v1.PersistentVolume) return nil, fmt.Errorf("Volume has no storage class") } - class, err := kubeClient.StorageV1beta1().StorageClasses().Get(className, metav1.GetOptions{}) + class, err := kubeClient.StorageV1().StorageClasses().Get(className, metav1.GetOptions{}) if err != nil { return nil, err } diff --git a/test/e2e/storage/vsphere_utils.go b/test/e2e/storage/vsphere_utils.go index 2171b7610ec..17b3d0ae7b0 100644 --- a/test/e2e/storage/vsphere_utils.go +++ b/test/e2e/storage/vsphere_utils.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" vsphere "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/pkg/volume/util/volumehelper" diff --git a/test/e2e/storage/vsphere_volume_diskformat.go b/test/e2e/storage/vsphere_volume_diskformat.go index 3ae91e17005..a19672db4c9 100644 --- a/test/e2e/storage/vsphere_volume_diskformat.go +++ b/test/e2e/storage/vsphere_volume_diskformat.go @@ -108,10 +108,10 @@ func invokeTest(f *framework.Framework, client clientset.Interface, namespace st By("Creating Storage Class With DiskFormat") storageClassSpec := getVSphereStorageClassSpec("thinsc", scParameters) - storageclass, err := client.StorageV1beta1().StorageClasses().Create(storageClassSpec) + storageclass, err := client.StorageV1().StorageClasses().Create(storageClassSpec) Expect(err).NotTo(HaveOccurred()) - defer client.StorageV1beta1().StorageClasses().Delete(storageclass.Name, nil) + defer client.StorageV1().StorageClasses().Delete(storageclass.Name, nil) By("Creating PVC using the Storage Class") pvclaimSpec := getVSphereClaimSpecWithStorageClassAnnotation(namespace, storageclass) diff --git a/test/e2e/storage/vsphere_volume_fstype.go b/test/e2e/storage/vsphere_volume_fstype.go index 73d60b843c0..46173722c7c 100644 --- a/test/e2e/storage/vsphere_volume_fstype.go +++ b/test/e2e/storage/vsphere_volume_fstype.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8stype "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/test/e2e/framework" @@ -94,7 +94,7 @@ func invokeTestForFstype(f *framework.Framework, client clientset.Interface, nam By("Creating Storage Class With Fstype") storageClassSpec := getVSphereStorageClassSpec("fstype", scParameters) - storageclass, err := client.StorageV1beta1().StorageClasses().Create(storageClassSpec) + storageclass, err := client.StorageV1().StorageClasses().Create(storageClassSpec) Expect(err).NotTo(HaveOccurred()) By("Creating PVC using the Storage Class") diff --git a/test/e2e/storage/vsphere_volume_ops_storm.go b/test/e2e/storage/vsphere_volume_ops_storm.go index e57d35cdf35..9664b0de3cc 100644 --- a/test/e2e/storage/vsphere_volume_ops_storm.go +++ b/test/e2e/storage/vsphere_volume_ops_storm.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/gomega" k8stype "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" vsphere "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/test/e2e/framework" @@ -84,7 +84,7 @@ var _ = framework.KubeDescribe("vsphere volume operations storm [Volume]", func( framework.DeletePersistentVolumeClaim(client, claim.Name, namespace) } By("Deleting StorageClass") - err = client.StorageV1beta1().StorageClasses().Delete(storageclass.Name, nil) + err = client.StorageV1().StorageClasses().Delete(storageclass.Name, nil) Expect(err).NotTo(HaveOccurred()) }) @@ -93,7 +93,7 @@ var _ = framework.KubeDescribe("vsphere volume operations storm [Volume]", func( By("Creating Storage Class") scParameters := make(map[string]string) scParameters["diskformat"] = "thin" - storageclass, err = client.StorageV1beta1().StorageClasses().Create(getVSphereStorageClassSpec("thinsc", scParameters)) + storageclass, err = client.StorageV1().StorageClasses().Create(getVSphereStorageClassSpec("thinsc", scParameters)) Expect(err).NotTo(HaveOccurred()) By("Creating PVCs using the Storage Class") diff --git a/test/integration/etcd/etcd_storage_path_test.go b/test/integration/etcd/etcd_storage_path_test.go index 8c77dadc965..132dcd67c0f 100644 --- a/test/integration/etcd/etcd_storage_path_test.go +++ b/test/integration/etcd/etcd_storage_path_test.go @@ -225,6 +225,7 @@ var etcdStorageData = map[schema.GroupVersionResource]struct { gvr("storage.k8s.io", "v1beta1", "storageclasses"): { stub: `{"metadata": {"name": "sc1"}, "provisioner": "aws"}`, expectedEtcdPath: "/registry/storageclasses/sc1", + expectedGVK: gvkP("storage.k8s.io", "v1", "StorageClass"), }, // -- @@ -232,7 +233,6 @@ var etcdStorageData = map[schema.GroupVersionResource]struct { gvr("storage.k8s.io", "v1", "storageclasses"): { stub: `{"metadata": {"name": "sc2"}, "provisioner": "aws"}`, expectedEtcdPath: "/registry/storageclasses/sc2", - expectedGVK: gvkP("storage.k8s.io", "v1beta1", "StorageClass"), }, // -- diff --git a/test/integration/framework/BUILD b/test/integration/framework/BUILD index e6cedcfe966..c69e2dede06 100644 --- a/test/integration/framework/BUILD +++ b/test/integration/framework/BUILD @@ -26,7 +26,7 @@ go_library( "//pkg/apis/extensions/v1beta1:go_default_library", "//pkg/apis/policy/v1alpha1:go_default_library", "//pkg/apis/rbac/v1alpha1:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", + "//pkg/apis/storage/v1: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/internalclientset:go_default_library", diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 35c4fa62aca..d702003b7d9 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -59,7 +59,7 @@ import ( extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" policy "k8s.io/kubernetes/pkg/apis/policy/v1alpha1" rbac "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index f6ece6df014..598e1b6eb43 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -28,7 +28,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/integration/framework" ) @@ -61,7 +61,7 @@ func DoTestStorageClasses(t *testing.T, client clientset.Interface, ns *v1.Names Provisioner: provisionerPluginName, } - if _, err := client.StorageV1beta1().StorageClasses().Create(&s); err != nil { + if _, err := client.StorageV1().StorageClasses().Create(&s); err != nil { t.Errorf("unable to create test storage class: %v", err) } defer deleteStorageClassOrErrorf(t, client, s.Namespace, s.Name) @@ -88,7 +88,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.StorageV1beta1().StorageClasses().Delete(name, nil); err != nil { + if err := c.StorageV1().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 adeb794ce13..1b5d8be2016 100644 --- a/test/integration/volume/persistent_volumes_test.go +++ b/test/integration/volume/persistent_volumes_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1/ref" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake" @@ -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.StorageV1beta1().StorageClasses().DeleteCollection(nil, metav1.ListOptions{}) + defer testClient.StorageV1().StorageClasses().DeleteCollection(nil, metav1.ListOptions{}) storageClass := storage.StorageClass{ TypeMeta: metav1.TypeMeta{ @@ -877,7 +877,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) { }, Provisioner: provisionerPluginName, } - testClient.StorageV1beta1().StorageClasses().Create(&storageClass) + testClient.StorageV1().StorageClasses().Create(&storageClass) stopCh := make(chan struct{}) informers.Start(stopCh) @@ -1136,7 +1136,7 @@ func createClients(ns *v1.Namespace, t *testing.T, s *httptest.Server, syncPerio Cloud: cloud, VolumeInformer: informers.Core().V1().PersistentVolumes(), ClaimInformer: informers.Core().V1().PersistentVolumeClaims(), - ClassInformer: informers.Storage().V1beta1().StorageClasses(), + ClassInformer: informers.Storage().V1().StorageClasses(), EnableDynamicProvisioning: true, }) if err != nil { From cde2746821954c8eba5ef4d2ab55691619cae4df Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Tue, 25 Apr 2017 10:13:38 +0200 Subject: [PATCH 2/2] Regenerate everything --- api/swagger-spec/resourceListing.json | 8 ++++---- .../k8s.io/client-go/pkg/apis/storage/install/install.go | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json index 3bdebc17147..ea421536924 100644 --- a/api/swagger-spec/resourceListing.json +++ b/api/swagger-spec/resourceListing.json @@ -113,14 +113,14 @@ "path": "/apis/settings.k8s.io", "description": "get information of a group" }, - { - "path": "/apis/storage.k8s.io/v1beta1", - "description": "API at /apis/storage.k8s.io/v1beta1" - }, { "path": "/apis/storage.k8s.io/v1", "description": "API at /apis/storage.k8s.io/v1" }, + { + "path": "/apis/storage.k8s.io/v1beta1", + "description": "API at /apis/storage.k8s.io/v1beta1" + }, { "path": "/apis/storage.k8s.io", "description": "get information of a group" diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go index fb590fecd69..4608a54ea70 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go @@ -37,9 +37,8 @@ func init() { func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ - GroupName: storage.GroupName, - // TODO: change the order when GKE supports v1 - VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version, v1.SchemeGroupVersion.Version}, + GroupName: storage.GroupName, + VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, ImportPrefix: "k8s.io/client-go/pkg/apis/storage", RootScopedKinds: sets.NewString("StorageClass"), AddInternalObjectsToScheme: storage.AddToScheme,