From fa93f1c4119d584976eaea0f45785c7cddb7545d Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 24 Feb 2017 13:34:19 +0100 Subject: [PATCH] Update imports --- pkg/controller/volume/persistentvolume/BUILD | 5 ++--- pkg/controller/volume/persistentvolume/binder_test.go | 4 ++-- pkg/controller/volume/persistentvolume/delete_test.go | 2 +- pkg/controller/volume/persistentvolume/framework_test.go | 4 ++-- pkg/controller/volume/persistentvolume/index.go | 2 +- pkg/controller/volume/persistentvolume/index_test.go | 2 +- pkg/controller/volume/persistentvolume/provision_test.go | 4 ++-- pkg/controller/volume/persistentvolume/recycle_test.go | 2 +- pkg/volume/glusterfs/BUILD | 2 +- pkg/volume/glusterfs/glusterfs.go | 2 +- test/e2e/BUILD | 3 +-- test/e2e/volume_provisioning.go | 2 +- test/e2e/vsphere_utils.go | 2 +- test/e2e/vsphere_volume_diskformat.go | 4 ++-- test/integration/framework/BUILD | 2 +- test/integration/framework/master_utils.go | 2 +- test/integration/storageclasses/storage_classes_test.go | 4 ++-- test/integration/volume/persistent_volumes_test.go | 6 +++--- 18 files changed, 26 insertions(+), 28 deletions(-) diff --git a/pkg/controller/volume/persistentvolume/BUILD b/pkg/controller/volume/persistentvolume/BUILD index 06c17601ea2..df04fb9d663 100644 --- a/pkg/controller/volume/persistentvolume/BUILD +++ b/pkg/controller/volume/persistentvolume/BUILD @@ -22,7 +22,6 @@ go_library( "//pkg/api/v1:go_default_library", "//pkg/apis/storage/v1:go_default_library", "//pkg/apis/storage/v1/util:go_default_library", - "//pkg/apis/storage/v1beta1/util: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/v1:go_default_library", @@ -67,8 +66,8 @@ go_test( "//pkg/api:go_default_library", "//pkg/api/testapi:go_default_library", "//pkg/api/v1:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/apis/storage/v1beta1/util:go_default_library", + "//pkg/apis/storage/v1:go_default_library", + "//pkg/apis/storage/v1/util: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", diff --git a/pkg/controller/volume/persistentvolume/binder_test.go b/pkg/controller/volume/persistentvolume/binder_test.go index b232b3d903c..981bbb9dff3 100644 --- a/pkg/controller/volume/persistentvolume/binder_test.go +++ b/pkg/controller/volume/persistentvolume/binder_test.go @@ -20,8 +20,8 @@ import ( "testing" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" ) // 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 b4c3effc420..ff5ad660692 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 909b85f4c00..d44234ed419 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -42,8 +42,8 @@ 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" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "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" diff --git a/pkg/controller/volume/persistentvolume/index.go b/pkg/controller/volume/persistentvolume/index.go index 059e33d927c..407c150c285 100644 --- a/pkg/controller/volume/persistentvolume/index.go +++ b/pkg/controller/volume/persistentvolume/index.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api/v1" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" ) // persistentVolumeOrderedIndex is a cache.Store that keeps persistent volumes diff --git a/pkg/controller/volume/persistentvolume/index_test.go b/pkg/controller/volume/persistentvolume/index_test.go index b0e87e795b5..04fc59703d2 100644 --- a/pkg/controller/volume/persistentvolume/index_test.go +++ b/pkg/controller/volume/persistentvolume/index_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/v1" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" ) func makePVC(size string, modfn func(*v1.PersistentVolumeClaim)) *v1.PersistentVolumeClaim { diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index 83e802d6304..64632c2cf16 100644 --- a/pkg/controller/volume/persistentvolume/provision_test.go +++ b/pkg/controller/volume/persistentvolume/provision_test.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1beta1" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" ) var class1Parameters = map[string]string{ diff --git a/pkg/controller/volume/persistentvolume/recycle_test.go b/pkg/controller/volume/persistentvolume/recycle_test.go index 86681c52587..1295ca58002 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/volume/glusterfs/BUILD b/pkg/volume/glusterfs/BUILD index bfb91555fcb..78d0625f8d4 100644 --- a/pkg/volume/glusterfs/BUILD +++ b/pkg/volume/glusterfs/BUILD @@ -19,7 +19,7 @@ go_library( tags = ["automanaged"], deps = [ "//pkg/api/v1:go_default_library", - "//pkg/apis/storage/v1beta1/util:go_default_library", + "//pkg/apis/storage/v1/util:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/util/exec:go_default_library", "//pkg/util/mount:go_default_library", diff --git a/pkg/volume/glusterfs/glusterfs.go b/pkg/volume/glusterfs/glusterfs.go index 016a8f257d9..3f5aa92ed9f 100644 --- a/pkg/volume/glusterfs/glusterfs.go +++ b/pkg/volume/glusterfs/glusterfs.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/api/v1" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/util/exec" "k8s.io/kubernetes/pkg/util/mount" diff --git a/test/e2e/BUILD b/test/e2e/BUILD index c0607c2da9e..cbd7f8150b2 100644 --- a/test/e2e/BUILD +++ b/test/e2e/BUILD @@ -120,8 +120,7 @@ go_library( "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/apis/storage/util:go_default_library", "//pkg/apis/storage/v1:go_default_library", - "//pkg/apis/storage/v1beta1:go_default_library", - "//pkg/apis/storage/v1beta1/util:go_default_library", + "//pkg/apis/storage/v1/util: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", diff --git a/test/e2e/volume_provisioning.go b/test/e2e/volume_provisioning.go index 1ad84dfe7c6..a1ad7a167f3 100644 --- a/test/e2e/volume_provisioning.go +++ b/test/e2e/volume_provisioning.go @@ -28,7 +28,7 @@ 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/v1beta1/util" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/vsphere_utils.go b/test/e2e/vsphere_utils.go index cbc1d4dca11..db59ef50dbe 100644 --- a/test/e2e/vsphere_utils.go +++ b/test/e2e/vsphere_utils.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "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/vsphere_volume_diskformat.go b/test/e2e/vsphere_volume_diskformat.go index 2b0189a8280..36dfa84cdc7 100644 --- a/test/e2e/vsphere_volume_diskformat.go +++ b/test/e2e/vsphere_volume_diskformat.go @@ -108,10 +108,10 @@ func invokeTest(client clientset.Interface, namespace string, nodeName string, n 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/integration/framework/BUILD b/test/integration/framework/BUILD index 0b29120df9d..41ef4d5f69a 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 6d3ba756176..82d1b15595e 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -58,7 +58,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 681099204fc..3186c1a0582 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -28,8 +28,8 @@ 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" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/volume/persistent_volumes_test.go b/test/integration/volume/persistent_volumes_test.go index 218d3843a5e..61403324439 100644 --- a/test/integration/volume/persistent_volumes_test.go +++ b/test/integration/volume/persistent_volumes_test.go @@ -33,8 +33,8 @@ 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" - storageutil "k8s.io/kubernetes/pkg/apis/storage/v1beta1/util" + storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" "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" @@ -1139,7 +1139,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, })