diff --git a/cmd/gke-certificates-controller/app/gke_signer.go b/cmd/gke-certificates-controller/app/gke_signer.go index 8509fcf0d89..cb7a0818277 100644 --- a/cmd/gke-certificates-controller/app/gke_signer.go +++ b/cmd/gke-certificates-controller/app/gke_signer.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" _ "k8s.io/kubernetes/pkg/apis/certificates/install" - capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + capi "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller/certificates" ) diff --git a/cmd/gke-certificates-controller/app/gke_signer_test.go b/cmd/gke-certificates-controller/app/gke_signer_test.go index c84388b2aa2..1d7a1ddf690 100644 --- a/cmd/gke-certificates-controller/app/gke_signer_test.go +++ b/cmd/gke-certificates-controller/app/gke_signer_test.go @@ -27,7 +27,7 @@ import ( "time" "k8s.io/client-go/tools/record" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" ) const kubeConfigTmpl = ` diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index e5cabde633b..47ce3f5b5e7 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -59,7 +59,7 @@ import ( "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/apis/componentconfig" componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/capabilities" diff --git a/federation/client/clientset_generated/federation_clientset/fake/register.go b/federation/client/clientset_generated/federation_clientset/fake/register.go index b62ca980a95..6a7d4f4f6ed 100644 --- a/federation/client/clientset_generated/federation_clientset/fake/register.go +++ b/federation/client/clientset_generated/federation_clientset/fake/register.go @@ -23,9 +23,9 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" corev1 "k8s.io/api/core/v1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + batchv1 "k8s.io/api/batch/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) var scheme = runtime.NewScheme() diff --git a/federation/client/clientset_generated/federation_clientset/scheme/register.go b/federation/client/clientset_generated/federation_clientset/scheme/register.go index a2100d5d86e..68695c4d4ff 100644 --- a/federation/client/clientset_generated/federation_clientset/scheme/register.go +++ b/federation/client/clientset_generated/federation_clientset/scheme/register.go @@ -23,9 +23,9 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" federationv1beta1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" corev1 "k8s.io/kubernetes/pkg/api/v1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + batchv1 "k8s.io/api/batch/v1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) var Scheme = runtime.NewScheme() diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go index 2057781ca79..cf8fc708791 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/autoscaling_client.go @@ -20,7 +20,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" ) type AutoscalingV1Interface interface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 704d9f5f387..e75c8e82831 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index dce52b089dc..220cc67554c 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/federation/client/clientset_generated/federation_clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" ) // HorizontalPodAutoscalersGetter has a method to return a HorizontalPodAutoscalerInterface. diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go index 55ecf11a916..acc5bfdd07c 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/batch_client.go @@ -20,7 +20,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" ) type BatchV1Interface interface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go index 9a20e9e85f1..cac2c4a38ed 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/fake/fake_job.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" ) // FakeJobs implements JobInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go index afed6a2f479..c0bfe414c83 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go +++ b/federation/client/clientset_generated/federation_clientset/typed/batch/v1/job.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" ) // JobsGetter has a method to return a JobInterface. diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go index ae5522c7731..553df8a11fb 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/daemonset.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // DaemonSetsGetter has a method to return a DaemonSetInterface. diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go index 07f13ff0f5a..51981698272 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // DeploymentsGetter has a method to return a DeploymentInterface. diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go index cd3cd1027ed..24734be6a6e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/deployment_expansion.go @@ -16,7 +16,7 @@ limitations under the License. package v1beta1 -import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" +import "k8s.io/api/extensions/v1beta1" // The DeploymentExpansion interface allows manually adding extra methods to the DeploymentInterface. type DeploymentExpansion interface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go index c62cb9b64fa..31815f20cb2 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/extensions_client.go @@ -20,7 +20,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) type ExtensionsV1beta1Interface interface { diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go index f1f2bf03d23..f05ad3819e7 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeDaemonSets implements DaemonSetInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go index 5a2544ad614..227756d807b 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeDeployments implements DeploymentInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index 7fb5027eab4..ef3f0e46b6e 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go index 97d902b979a..8b50d004faf 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_ingress.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeIngresses implements IngressInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go index 92d3a49a999..f4d1a8a076c 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeReplicaSets implements ReplicaSetInterface diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go index 997bedb7506..ce20ef42abc 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/ingress.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // IngressesGetter has a method to return a IngressInterface. diff --git a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go index 9e7f0fd5e5d..e4e3e087c71 100644 --- a/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go +++ b/federation/client/clientset_generated/federation_clientset/typed/extensions/v1beta1/replicaset.go @@ -22,7 +22,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" scheme "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/scheme" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // ReplicaSetsGetter has a method to return a ReplicaSetInterface. diff --git a/federation/cmd/federation-apiserver/app/autoscaling.go b/federation/cmd/federation-apiserver/app/autoscaling.go index ed147f830bb..708ed0eab3f 100644 --- a/federation/cmd/federation-apiserver/app/autoscaling.go +++ b/federation/cmd/federation-apiserver/app/autoscaling.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" _ "k8s.io/kubernetes/pkg/apis/autoscaling/install" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscalingv1 "k8s.io/api/autoscaling/v1" hpastorage "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" ) diff --git a/federation/cmd/federation-apiserver/app/batch.go b/federation/cmd/federation-apiserver/app/batch.go index 5076ca023df..203ab9507c3 100644 --- a/federation/cmd/federation-apiserver/app/batch.go +++ b/federation/cmd/federation-apiserver/app/batch.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" _ "k8s.io/kubernetes/pkg/apis/batch/install" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" + batchv1 "k8s.io/api/batch/v1" jobstorage "k8s.io/kubernetes/pkg/registry/batch/job/storage" ) diff --git a/federation/cmd/federation-apiserver/app/extensions.go b/federation/cmd/federation-apiserver/app/extensions.go index 292979ae50b..02a5ac91082 100644 --- a/federation/cmd/federation-apiserver/app/extensions.go +++ b/federation/cmd/federation-apiserver/app/extensions.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" _ "k8s.io/kubernetes/pkg/apis/extensions/install" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" daemonsetstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" ingressstore "k8s.io/kubernetes/pkg/registry/extensions/ingress/storage" diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index 69fcc05fe31..9bd16bd35ff 100644 --- a/federation/cmd/federation-apiserver/app/server.go +++ b/federation/cmd/federation-apiserver/app/server.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/api/core/v1" - extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" diff --git a/federation/pkg/federatedtypes/daemonset.go b/federation/pkg/federatedtypes/daemonset.go index 14598ae93cf..d3daf333c05 100644 --- a/federation/pkg/federatedtypes/daemonset.go +++ b/federation/pkg/federatedtypes/daemonset.go @@ -27,7 +27,7 @@ import ( federationclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/api/core/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller.go b/federation/pkg/federation-controller/deployment/deploymentcontroller.go index a806488d920..bc62f4a19d0 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller.go @@ -46,7 +46,7 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util/replicapreferences" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/api/core/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" ) diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go index aeff26a62fc..d71edb9338e 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller_test.go @@ -30,7 +30,7 @@ import ( fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/api/core/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go index 8050238a272..cfd68682a0b 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller.go @@ -40,7 +40,7 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util/eventsink" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" diff --git a/federation/pkg/federation-controller/ingress/ingress_controller_test.go b/federation/pkg/federation-controller/ingress/ingress_controller_test.go index fd3eee87299..e34a48e1b15 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller_test.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller_test.go @@ -35,7 +35,7 @@ import ( finalizersutil "k8s.io/kubernetes/federation/pkg/federation-controller/util/finalizers" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/api/core/v1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" fakekubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index 7789f254fd6..762f57bbc6d 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -46,7 +46,7 @@ import ( "k8s.io/kubernetes/federation/pkg/federation-controller/util/replicapreferences" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/api/core/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" ) diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go index 3f239c43a37..96e3a103324 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller_test.go @@ -29,7 +29,7 @@ import ( fedclientfake "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" apiv1 "k8s.io/api/core/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeclientfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/federation/pkg/federation-controller/util/deployment.go b/federation/pkg/federation-controller/util/deployment.go index c4f4c0f9646..856b94cced5 100644 --- a/federation/pkg/federation-controller/util/deployment.go +++ b/federation/pkg/federation-controller/util/deployment.go @@ -20,7 +20,7 @@ import ( "reflect" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extensions_v1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1 "k8s.io/api/extensions/v1beta1" deputils "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/federation/pkg/federation-controller/util/deployment_test.go b/federation/pkg/federation-controller/util/deployment_test.go index 4550c6728cc..2690480e2bc 100644 --- a/federation/pkg/federation-controller/util/deployment_test.go +++ b/federation/pkg/federation-controller/util/deployment_test.go @@ -20,7 +20,7 @@ import ( "testing" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" deputils "k8s.io/kubernetes/pkg/controller/deployment/util" "github.com/stretchr/testify/assert" diff --git a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go index 3353bf333b4..3c3e752d5a2 100644 --- a/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go +++ b/federation/pkg/federation-controller/util/podanalyzer/pod_helper_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/federation/pkg/federation-controller/util" api_v1 "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "github.com/stretchr/testify/assert" ) diff --git a/federation/pkg/federation-controller/util/replicapreferences/preferences_test.go b/federation/pkg/federation-controller/util/replicapreferences/preferences_test.go index 04f84a70ba3..8a23ed300c5 100644 --- a/federation/pkg/federation-controller/util/replicapreferences/preferences_test.go +++ b/federation/pkg/federation-controller/util/replicapreferences/preferences_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/runtime" diff --git a/federation/pkg/kubefed/init/init_test.go b/federation/pkg/kubefed/init/init_test.go index 913f456719c..f288c1a62b8 100644 --- a/federation/pkg/kubefed/init/init_test.go +++ b/federation/pkg/kubefed/init/init_test.go @@ -51,9 +51,9 @@ import ( "k8s.io/kubernetes/pkg/api/helper" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/rbac" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/federation/pkg/kubefed/join_test.go b/federation/pkg/kubefed/join_test.go index 7088e00340e..5b1149a53f6 100644 --- a/federation/pkg/kubefed/join_test.go +++ b/federation/pkg/kubefed/join_test.go @@ -38,8 +38,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + "k8s.io/api/extensions/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/kubernetes/pkg/kubectl" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/federation/plugin/pkg/admission/schedulingpolicy/admission_test.go b/federation/plugin/pkg/admission/schedulingpolicy/admission_test.go index 1f6eb66b8a4..b3a57cd704e 100644 --- a/federation/plugin/pkg/admission/schedulingpolicy/admission_test.go +++ b/federation/plugin/pkg/admission/schedulingpolicy/admission_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" - extensionsv1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake" ) diff --git a/pkg/client/clientset_generated/clientset/fake/register.go b/pkg/client/clientset_generated/clientset/fake/register.go index 4f0981a51e7..214700ea881 100644 --- a/pkg/client/clientset_generated/clientset/fake/register.go +++ b/pkg/client/clientset_generated/clientset/fake/register.go @@ -22,25 +22,25 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" corev1 "k8s.io/api/core/v1" - admissionregistrationv1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - authorizationv1 "k8s.io/kubernetes/pkg/apis/authorization/v1" - authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingv2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - certificatesv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - networkingv1 "k8s.io/kubernetes/pkg/apis/networking/v1" - policyv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - settingsv1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" - storagev1 "k8s.io/kubernetes/pkg/apis/storage/v1" - storagev1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + authenticationv1 "k8s.io/api/authentication/v1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" + authorizationv1 "k8s.io/api/authorization/v1" + authorizationv1beta1 "k8s.io/api/authorization/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" + certificatesv1beta1 "k8s.io/api/certificates/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" + networkingv1 "k8s.io/api/networking/v1" + policyv1beta1 "k8s.io/api/policy/v1beta1" + rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" + settingsv1alpha1 "k8s.io/api/settings/v1alpha1" + storagev1 "k8s.io/api/storage/v1" + storagev1beta1 "k8s.io/api/storage/v1beta1" ) var scheme = runtime.NewScheme() diff --git a/pkg/client/clientset_generated/clientset/scheme/register.go b/pkg/client/clientset_generated/clientset/scheme/register.go index 1047b67a65d..349825b301b 100644 --- a/pkg/client/clientset_generated/clientset/scheme/register.go +++ b/pkg/client/clientset_generated/clientset/scheme/register.go @@ -22,25 +22,25 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" corev1 "k8s.io/kubernetes/pkg/api/v1" - admissionregistrationv1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - authorizationv1 "k8s.io/kubernetes/pkg/apis/authorization/v1" - authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingv2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - certificatesv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - networkingv1 "k8s.io/kubernetes/pkg/apis/networking/v1" - policyv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - settingsv1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" - storagev1 "k8s.io/kubernetes/pkg/apis/storage/v1" - storagev1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + authenticationv1 "k8s.io/api/authentication/v1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" + authorizationv1 "k8s.io/api/authorization/v1" + authorizationv1beta1 "k8s.io/api/authorization/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" + certificatesv1beta1 "k8s.io/api/certificates/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" + networkingv1 "k8s.io/api/networking/v1" + policyv1beta1 "k8s.io/api/policy/v1beta1" + rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" + settingsv1alpha1 "k8s.io/api/settings/v1alpha1" + storagev1 "k8s.io/api/storage/v1" + storagev1beta1 "k8s.io/api/storage/v1beta1" ) var Scheme = runtime.NewScheme() diff --git a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/admissionregistration_client.go b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/admissionregistration_client.go index 87994cbebd8..df36c50c299 100644 --- a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/admissionregistration_client.go +++ b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/admissionregistration_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 4af07b1a9f3..d4343f9b7c0 100644 --- a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go index 6de5220def5..898f1a75765 100644 --- a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go +++ b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" ) // FakeExternalAdmissionHookConfigurations implements ExternalAdmissionHookConfigurationInterface diff --git a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go index c66367b2aa7..c7349d2c2af 100644 --- a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go +++ b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" ) // FakeInitializerConfigurations implements InitializerConfigurationInterface diff --git a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/initializerconfiguration.go b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/initializerconfiguration.go index 9a7ba3aad99..4ae57bcaaff 100644 --- a/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/pkg/client/clientset_generated/clientset/typed/admissionregistration/v1alpha1/initializerconfiguration.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go index 18ab6a6f105..a8283e21f27 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/apps_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/controllerrevision.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/controllerrevision.go index ce536b0ddf0..e2cab3b57e9 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/controllerrevision.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/controllerrevision.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/deployment.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/deployment.go index 9e375f68510..0202786ddd1 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_controllerrevision.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_controllerrevision.go index 0a44b546467..86b5244ea99 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_controllerrevision.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_controllerrevision.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // FakeControllerRevisions implements ControllerRevisionInterface diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_deployment.go index ab277d3d14f..4bebba8894a 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_deployment.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // FakeDeployments implements DeploymentInterface diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go index c14db9cbff5..ac3c6fe12b9 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/fake/fake_statefulset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // FakeStatefulSets implements StatefulSetInterface diff --git a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go index 7acff8de044..6b88484d389 100644 --- a/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go +++ b/pkg/client/clientset_generated/clientset/typed/apps/v1beta1/statefulset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go index beed71ea3c8..6d69c8b39e9 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1/authentication_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/authentication/v1" + v1 "k8s.io/api/authentication/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake/fake_tokenreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake/fake_tokenreview_expansion.go index e27c53ce137..2beb0e4ba8f 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake/fake_tokenreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1/fake/fake_tokenreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" ) func (c *FakeTokenReviews) Create(tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1/tokenreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1/tokenreview_expansion.go index 012749ec3e2..ea21f1b4a2b 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1/tokenreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1/tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" ) type TokenReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go index b3aa17eb0b6..0aec1ed5d5f 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/authentication_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + v1beta1 "k8s.io/api/authentication/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go index 9503b295a25..70f84a7331c 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + authenticationapi "k8s.io/api/authentication/v1beta1" ) func (c *FakeTokenReviews) Create(tokenReview *authenticationapi.TokenReview) (result *authenticationapi.TokenReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview_expansion.go index 35d81d80f49..8f186fa76ae 100644 --- a/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authentication/v1beta1/tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + authenticationapi "k8s.io/api/authentication/v1beta1" ) type TokenReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go index 232fdc95940..c2edac3c819 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/authorization_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + v1 "k8s.io/api/authorization/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go index d63b59484ff..52aff5f979e 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) func (c *FakeLocalSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go index 86a6726e288..1078e93a934 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) func (c *FakeSelfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go index 5e8cff02296..6955028fac8 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/localsubjectaccessreview_expansion.go index 13dd9ff3fd9..0c123b07ce5 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) type LocalSubjectAccessReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/selfsubjectaccessreview_expansion.go index 698d8eef43d..5b70a27dd62 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) type SelfSubjectAccessReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1/subjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1/subjectaccessreview_expansion.go index eb1db898166..b5ed87d3015 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1/subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1/subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) // The SubjectAccessReviewExpansion interface allows manually adding extra methods to the AuthorizationInterface. diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go index 3801cdc75d2..38fbe5e67d5 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/authorization_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + v1beta1 "k8s.io/api/authorization/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go index b65004a3535..d3aceb6c6e1 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) func (c *FakeLocalSubjectAccessReviews) Create(sar *authorizationapi.LocalSubjectAccessReview) (result *authorizationapi.LocalSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go index c2e1e000929..7e57258e0e0 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) func (c *FakeSelfSubjectAccessReviews) Create(sar *authorizationapi.SelfSubjectAccessReview) (result *authorizationapi.SelfSubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go index 49232ed8ce9..54729652053 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) func (c *FakeSubjectAccessReviews) Create(sar *authorizationapi.SubjectAccessReview) (result *authorizationapi.SubjectAccessReview, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go index 3a3c64c1b82..bf1b8a5f108 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) type LocalSubjectAccessReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go index a64678243ec..58fecfd85bf 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) type SelfSubjectAccessReviewExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview_expansion.go b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview_expansion.go index bf57a7b07d8..4f93689e8ac 100644 --- a/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1/subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) // The SubjectAccessReviewExpansion interface allows manually adding extra methods to the AuthorizationInterface. diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go index 7ea617b8a17..eccf26b14d6 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/autoscaling_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 704d9f5f387..e75c8e82831 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go index 1651dbf191d..621eb177a84 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go index 90ce24f3065..53c18744c73 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/autoscaling_client.go @@ -19,7 +19,7 @@ package v2alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go index 81156fa4189..aef20a3e455 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" ) // FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface diff --git a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go index d359517e9fb..8d4b587a07e 100644 --- a/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/pkg/client/clientset_generated/clientset/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go index a269f006312..faca56384cc 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/batch_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go index 9a20e9e85f1..cac2c4a38ed 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/fake/fake_job.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" ) // FakeJobs implements JobInterface diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go index 63b223ce4be..7af535fd255 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v1/job.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go index bd0e365e4ee..e914030d9fa 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/batch_client.go @@ -19,7 +19,7 @@ package v2alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go index bcf2b75f708..323f14f9d3c 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/cronjob.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go index ced5318c5d2..c50fa6521ce 100644 --- a/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go +++ b/pkg/client/clientset_generated/clientset/typed/batch/v2alpha1/fake/fake_cronjob.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" ) // FakeCronJobs implements CronJobInterface diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go index 15151f5179b..96678345423 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificates_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go index e30b929eaab..24f26d78aa0 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest_expansion.go index e7db4598664..c63b80638f6 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/certificatesigningrequest_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" ) type CertificateSigningRequestExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go index 6b0f1964ecf..fe4f17433b0 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" ) // FakeCertificateSigningRequests implements CertificateSigningRequestInterface diff --git a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go index ce42faa0860..adb3d059cae 100644 --- a/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" ) func (c *FakeCertificateSigningRequests) UpdateApproval(certificateSigningRequest *certificates.CertificateSigningRequest) (result *certificates.CertificateSigningRequest, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go index 2fff476ad8c..1e738f9a6cb 100644 --- a/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/core/v1/fake/fake_pod_expansion.go @@ -20,7 +20,7 @@ import ( restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/api/core/v1" - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" ) func (c *FakePods) Bind(binding *v1.Binding) error { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go index f55eb1e696d..59d48a251ff 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/daemonset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go index a632d8ba5f1..33441712ccd 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment_expansion.go index cd3cd1027ed..24734be6a6e 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/deployment_expansion.go @@ -16,7 +16,7 @@ limitations under the License. package v1beta1 -import "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" +import "k8s.io/api/extensions/v1beta1" // The DeploymentExpansion interface allows manually adding extra methods to the DeploymentInterface. type DeploymentExpansion interface { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go index 3f86c853fc4..f767d294223 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/extensions_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go index f1f2bf03d23..f05ad3819e7 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeDaemonSets implements DaemonSetInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go index 5a2544ad614..227756d807b 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeDeployments implements DeploymentInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index 7fb5027eab4..ef3f0e46b6e 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -18,7 +18,7 @@ package fake import ( core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) func (c *FakeDeployments) Rollback(deploymentRollback *v1beta1.DeploymentRollback) error { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go index 97d902b979a..8b50d004faf 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_ingress.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeIngresses implements IngressInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go index b8b2605467f..2bf7c8e086a 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakePodSecurityPolicies implements PodSecurityPolicyInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go index 92d3a49a999..f4d1a8a076c 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeReplicaSets implements ReplicaSetInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go index a05f6353fda..c603a7b0f18 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_scale_expansion.go @@ -19,7 +19,7 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" core "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) func (c *FakeScales) Get(kind string, name string) (result *v1beta1.Scale, err error) { diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index 66bd8b50734..21d31383af8 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // FakeThirdPartyResources implements ThirdPartyResourceInterface diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go index 8df8772f12d..1979f98ab69 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/ingress.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go index d8ef5b89a66..31df40df0a2 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/podsecuritypolicy.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go index f9c61d69871..e30b740b028 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/replicaset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale_expansion.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale_expansion.go index 12224e58b9c..d23395a04d6 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/scale_expansion.go @@ -19,7 +19,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) // The ScaleExpansion interface allows manually adding extra methods to the ScaleInterface. diff --git a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go index cf1b52864d9..554c6901267 100644 --- a/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1/thirdpartyresource.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/networking/v1/fake/fake_networkpolicy.go b/pkg/client/clientset_generated/clientset/typed/networking/v1/fake/fake_networkpolicy.go index adac8ab62e3..b1237ff744d 100644 --- a/pkg/client/clientset_generated/clientset/typed/networking/v1/fake/fake_networkpolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/networking/v1/fake/fake_networkpolicy.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" ) // FakeNetworkPolicies implements NetworkPolicyInterface diff --git a/pkg/client/clientset_generated/clientset/typed/networking/v1/networking_client.go b/pkg/client/clientset_generated/clientset/typed/networking/v1/networking_client.go index fcfd62ca3c2..65f0a6b3b9e 100644 --- a/pkg/client/clientset_generated/clientset/typed/networking/v1/networking_client.go +++ b/pkg/client/clientset_generated/clientset/typed/networking/v1/networking_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/networking/v1/networkpolicy.go b/pkg/client/clientset_generated/clientset/typed/networking/v1/networkpolicy.go index a4bbaa6c17c..90cfeb39870 100644 --- a/pkg/client/clientset_generated/clientset/typed/networking/v1/networkpolicy.go +++ b/pkg/client/clientset_generated/clientset/typed/networking/v1/networkpolicy.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction_expansion.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction_expansion.go index c24252cb015..40bad265f07 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/eviction_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" ) // The EvictionExpansion interface allows manually adding extra methods to the ScaleInterface. diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go index 3061efe4704..5ed00ddff0b 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_eviction_expansion.go @@ -19,7 +19,7 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" core "k8s.io/client-go/testing" - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" ) func (c *FakeEvictions) Evict(eviction *policy.Eviction) error { diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go index 2200729db97..0a72f244b5b 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" ) // FakePodDisruptionBudgets implements PodDisruptionBudgetInterface diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go index c32f95d42b4..c31473b6c52 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/poddisruptionbudget.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go index 2424ed90ff9..c2a497dda3c 100644 --- a/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go +++ b/pkg/client/clientset_generated/clientset/typed/policy/v1beta1/policy_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go index 4e41cad06a4..815f19b3883 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrole.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go index 759d57adfd6..ab6a499187e 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/clusterrolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go index 38227b73f44..7ebbc252b7f 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrole.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // FakeClusterRoles implements ClusterRoleInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go index 83db40222a6..f10357419f4 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // FakeClusterRoleBindings implements ClusterRoleBindingInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go index d0f52d3e670..788f5a4de9f 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_role.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // FakeRoles implements RoleInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go index 2bd8bb2cc51..6bab7de009d 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/fake/fake_rolebinding.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // FakeRoleBindings implements RoleBindingInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go index b9d09e5bc8a..fa8aa4f48a2 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rbac_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go index 900e1cc1e40..dbc3fe80ccd 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/role.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go index 63481f0ad74..897b6e8c85b 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1alpha1/rolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go index 767f784f7d5..60256fecaf7 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrole.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go index d629b13aff4..83819a4dce9 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/clusterrolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go index efe9a754401..eeeb0d2cc97 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrole.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // FakeClusterRoles implements ClusterRoleInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go index 5e974331894..0b2792f2de1 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // FakeClusterRoleBindings implements ClusterRoleBindingInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go index a1da854ec9e..d26c3685d27 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_role.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // FakeRoles implements RoleInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go index 74c762507bb..05f3bd609db 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/fake/fake_rolebinding.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // FakeRoleBindings implements RoleBindingInterface diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go index 20c8da68c8c..aebd75a0e53 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rbac_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go index cc6a217e2fd..d5ed21ff611 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/role.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go index 5c87ad1e686..0681cd186df 100644 --- a/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go +++ b/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1/rolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/fake/fake_podpreset.go b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/fake/fake_podpreset.go index 8877995180a..17ac35a6320 100644 --- a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/fake/fake_podpreset.go +++ b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/fake/fake_podpreset.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" ) // FakePodPresets implements PodPresetInterface diff --git a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/podpreset.go b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/podpreset.go index f94f98a7668..1a4905af159 100644 --- a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/podpreset.go +++ b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/podpreset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/settings_client.go b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/settings_client.go index 1d6dc46c1a4..61deaae892e 100644 --- a/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/settings_client.go +++ b/pkg/client/clientset_generated/clientset/typed/settings/v1alpha1/settings_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go index ed63d01cdb3..1a747bb2513 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1/fake/fake_storageclass.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1 "k8s.io/kubernetes/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" ) // FakeStorageClasses implements StorageClassInterface diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go index 5d37d8417c2..5d1531ac8b1 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1/storage_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go index 3a1efa01633..aa9e21ea001 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1/storageclass.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1 "k8s.io/kubernetes/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go index 6c75c31ef68..d9beae58bec 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/fake/fake_storageclass.go @@ -23,7 +23,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" ) // FakeStorageClasses implements StorageClassInterface diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go index 6925575e06f..70fed434d2d 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storage_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go index 69fb440ee2c..a5afcef84bf 100644 --- a/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go +++ b/pkg/client/clientset_generated/clientset/typed/storage/v1beta1/storageclass.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" scheme "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/scheme" ) diff --git a/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 84b0162da32..1628d88570e 100644 --- a/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - admissionregistration_v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/initializerconfiguration.go b/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/initializerconfiguration.go index f351d269fb8..465c08b092a 100644 --- a/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/pkg/client/informers/informers_generated/externalversions/admissionregistration/v1alpha1/initializerconfiguration.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - admissionregistration_v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/admissionregistration/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/controllerrevision.go b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/controllerrevision.go index a9aa1ed7fa1..ec16f32915f 100644 --- a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/controllerrevision.go +++ b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/controllerrevision.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/deployment.go b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/deployment.go index 9803089b682..90967dc724e 100644 --- a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/deployment.go +++ b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/deployment.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/statefulset.go b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/statefulset.go index 88c541a7cc5..ea525851015 100644 --- a/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/statefulset.go +++ b/pkg/client/informers/informers_generated/externalversions/apps/v1beta1/statefulset.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apps_v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/externalversions/autoscaling/v1/horizontalpodautoscaler.go index 41e0d8161f7..220860f38c8 100644 --- a/pkg/client/informers/informers_generated/externalversions/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/informers/informers_generated/externalversions/autoscaling/v1/horizontalpodautoscaler.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscaling_v1 "k8s.io/api/autoscaling/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v1" diff --git a/pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/horizontalpodautoscaler.go index f5e11490df2..712c6b734ca 100644 --- a/pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/pkg/client/informers/informers_generated/externalversions/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - autoscaling_v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscaling_v2alpha1 "k8s.io/api/autoscaling/v2alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v2alpha1 "k8s.io/kubernetes/pkg/client/listers/autoscaling/v2alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/batch/v1/job.go b/pkg/client/informers/informers_generated/externalversions/batch/v1/job.go index 141c76bc9b8..a055e92b278 100644 --- a/pkg/client/informers/informers_generated/externalversions/batch/v1/job.go +++ b/pkg/client/informers/informers_generated/externalversions/batch/v1/job.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + batch_v1 "k8s.io/api/batch/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/batch/v1" diff --git a/pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/cronjob.go b/pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/cronjob.go index 1dfdb320116..7a10a386b2c 100644 --- a/pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/cronjob.go +++ b/pkg/client/informers/informers_generated/externalversions/batch/v2alpha1/cronjob.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batch_v2alpha1 "k8s.io/api/batch/v2alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v2alpha1 "k8s.io/kubernetes/pkg/client/listers/batch/v2alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/certificatesigningrequest.go index e475ccadad9..0fb4a7f0729 100644 --- a/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1/certificatesigningrequest.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates_v1beta1 "k8s.io/api/certificates/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/daemonset.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/daemonset.go index f607a9e395b..5310315737f 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/daemonset.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/daemonset.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/deployment.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/deployment.go index 41e14f713a6..8afac13c681 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/deployment.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/deployment.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/ingress.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/ingress.go index 9c8781e8109..6ccf059aab1 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/ingress.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/ingress.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/podsecuritypolicy.go index 6057fb841c4..70108ec069e 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/podsecuritypolicy.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/replicaset.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/replicaset.go index 4f9e529e038..495afa92398 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/replicaset.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/replicaset.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/thirdpartyresource.go b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/thirdpartyresource.go index 7cf18a97a88..f7bbe3c364f 100644 --- a/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1/thirdpartyresource.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/generic.go b/pkg/client/informers/informers_generated/externalversions/generic.go index beeaa8d937f..cea721b484e 100644 --- a/pkg/client/informers/informers_generated/externalversions/generic.go +++ b/pkg/client/informers/informers_generated/externalversions/generic.go @@ -23,21 +23,21 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" api_v1 "k8s.io/api/core/v1" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batch_v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - extensions_v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - networking_v1 "k8s.io/kubernetes/pkg/apis/networking/v1" - policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - settings_v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" - storage_v1 "k8s.io/kubernetes/pkg/apis/storage/v1" - storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" + v1beta1 "k8s.io/api/apps/v1beta1" + v1 "k8s.io/api/autoscaling/v1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" + batch_v1 "k8s.io/api/batch/v1" + batch_v2alpha1 "k8s.io/api/batch/v2alpha1" + certificates_v1beta1 "k8s.io/api/certificates/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" + networking_v1 "k8s.io/api/networking/v1" + policy_v1beta1 "k8s.io/api/policy/v1beta1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" + settings_v1alpha1 "k8s.io/api/settings/v1alpha1" + storage_v1 "k8s.io/api/storage/v1" + storage_v1beta1 "k8s.io/api/storage/v1beta1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/pkg/client/informers/informers_generated/externalversions/networking/v1/networkpolicy.go b/pkg/client/informers/informers_generated/externalversions/networking/v1/networkpolicy.go index a8912ca43ce..9607a247a07 100644 --- a/pkg/client/informers/informers_generated/externalversions/networking/v1/networkpolicy.go +++ b/pkg/client/informers/informers_generated/externalversions/networking/v1/networkpolicy.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - networking_v1 "k8s.io/kubernetes/pkg/apis/networking/v1" + networking_v1 "k8s.io/api/networking/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/networking/v1" diff --git a/pkg/client/informers/informers_generated/externalversions/policy/v1beta1/poddisruptionbudget.go b/pkg/client/informers/informers_generated/externalversions/policy/v1beta1/poddisruptionbudget.go index 2585e1f605b..4b8219e0b1c 100644 --- a/pkg/client/informers/informers_generated/externalversions/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/informers/informers_generated/externalversions/policy/v1beta1/poddisruptionbudget.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - policy_v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policy_v1beta1 "k8s.io/api/policy/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/policy/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrole.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrole.go index d5df112b568..42da403bb5a 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrole.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrolebinding.go index e6d8ee56f24..842092add41 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/clusterrolebinding.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/role.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/role.go index 12ba4941adb..2ae2a4659b8 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/role.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/role.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/rolebinding.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/rolebinding.go index 68da8d2014c..9a29150c541 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1alpha1/rolebinding.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrole.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrole.go index 8e9abd6d287..cd6139ed0a8 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrole.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrole.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrolebinding.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrolebinding.go index cc8ff1ce6cc..1fb1b2817f3 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/clusterrolebinding.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/role.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/role.go index fb290e18299..2521908410f 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/role.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/role.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/rolebinding.go b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/rolebinding.go index 868cad29b1f..8fee1876a23 100644 --- a/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/rolebinding.go +++ b/pkg/client/informers/informers_generated/externalversions/rbac/v1beta1/rolebinding.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - rbac_v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/rbac/v1beta1" diff --git a/pkg/client/informers/informers_generated/externalversions/settings/v1alpha1/podpreset.go b/pkg/client/informers/informers_generated/externalversions/settings/v1alpha1/podpreset.go index aba0c77c061..e7b37828791 100644 --- a/pkg/client/informers/informers_generated/externalversions/settings/v1alpha1/podpreset.go +++ b/pkg/client/informers/informers_generated/externalversions/settings/v1alpha1/podpreset.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - settings_v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + settings_v1alpha1 "k8s.io/api/settings/v1alpha1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1alpha1 "k8s.io/kubernetes/pkg/client/listers/settings/v1alpha1" diff --git a/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go b/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go index cd3b293397e..af2b5907c02 100644 --- a/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go +++ b/pkg/client/informers/informers_generated/externalversions/storage/v1/storageclass.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - storage_v1 "k8s.io/kubernetes/pkg/apis/storage/v1" + storage_v1 "k8s.io/api/storage/v1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1 "k8s.io/kubernetes/pkg/client/listers/storage/v1" diff --git a/pkg/client/informers/informers_generated/externalversions/storage/v1beta1/storageclass.go b/pkg/client/informers/informers_generated/externalversions/storage/v1beta1/storageclass.go index e573629fce2..347c3f095ee 100644 --- a/pkg/client/informers/informers_generated/externalversions/storage/v1beta1/storageclass.go +++ b/pkg/client/informers/informers_generated/externalversions/storage/v1beta1/storageclass.go @@ -23,7 +23,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - storage_v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storage_v1beta1 "k8s.io/api/storage/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" internalinterfaces "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/internalinterfaces" v1beta1 "k8s.io/kubernetes/pkg/client/listers/storage/v1beta1" diff --git a/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 1bdbfa0027c..234bb8c979e 100644 --- a/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/pkg/client/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" ) // ExternalAdmissionHookConfigurationLister helps list ExternalAdmissionHookConfigurations. diff --git a/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go b/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go index 22de9622bec..cb98bf13f35 100644 --- a/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/pkg/client/listers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" ) // InitializerConfigurationLister helps list InitializerConfigurations. diff --git a/pkg/client/listers/apps/v1beta1/controllerrevision.go b/pkg/client/listers/apps/v1beta1/controllerrevision.go index f6569c34f72..7ac26a9d947 100644 --- a/pkg/client/listers/apps/v1beta1/controllerrevision.go +++ b/pkg/client/listers/apps/v1beta1/controllerrevision.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // ControllerRevisionLister helps list ControllerRevisions. diff --git a/pkg/client/listers/apps/v1beta1/deployment.go b/pkg/client/listers/apps/v1beta1/deployment.go index 41c0300b9fb..42ce53e46b7 100644 --- a/pkg/client/listers/apps/v1beta1/deployment.go +++ b/pkg/client/listers/apps/v1beta1/deployment.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // DeploymentLister helps list Deployments. diff --git a/pkg/client/listers/apps/v1beta1/scale.go b/pkg/client/listers/apps/v1beta1/scale.go index 5f587cc0e86..416b5ae0f70 100644 --- a/pkg/client/listers/apps/v1beta1/scale.go +++ b/pkg/client/listers/apps/v1beta1/scale.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // ScaleLister helps list Scales. diff --git a/pkg/client/listers/apps/v1beta1/statefulset.go b/pkg/client/listers/apps/v1beta1/statefulset.go index 03bcd475817..05a712d0905 100644 --- a/pkg/client/listers/apps/v1beta1/statefulset.go +++ b/pkg/client/listers/apps/v1beta1/statefulset.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" ) // StatefulSetLister helps list StatefulSets. diff --git a/pkg/client/listers/apps/v1beta1/statefulset_expansion.go b/pkg/client/listers/apps/v1beta1/statefulset_expansion.go index 949f23cbf8d..2bb5499b721 100644 --- a/pkg/client/listers/apps/v1beta1/statefulset_expansion.go +++ b/pkg/client/listers/apps/v1beta1/statefulset_expansion.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" ) // StatefulSetListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/authentication/v1/tokenreview.go b/pkg/client/listers/authentication/v1/tokenreview.go index aab044fe102..32f7b8696fc 100644 --- a/pkg/client/listers/authentication/v1/tokenreview.go +++ b/pkg/client/listers/authentication/v1/tokenreview.go @@ -23,7 +23,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/authentication/v1" + v1 "k8s.io/api/authentication/v1" ) // TokenReviewLister helps list TokenReviews. diff --git a/pkg/client/listers/authentication/v1beta1/tokenreview.go b/pkg/client/listers/authentication/v1beta1/tokenreview.go index 97cfe344195..56de9687c03 100644 --- a/pkg/client/listers/authentication/v1beta1/tokenreview.go +++ b/pkg/client/listers/authentication/v1beta1/tokenreview.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + v1beta1 "k8s.io/api/authentication/v1beta1" ) // TokenReviewLister helps list TokenReviews. diff --git a/pkg/client/listers/authorization/v1/localsubjectaccessreview.go b/pkg/client/listers/authorization/v1/localsubjectaccessreview.go index e6fa3b325a3..e541448b83f 100644 --- a/pkg/client/listers/authorization/v1/localsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1/localsubjectaccessreview.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + v1 "k8s.io/api/authorization/v1" ) // LocalSubjectAccessReviewLister helps list LocalSubjectAccessReviews. diff --git a/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go index ae5758e901c..b8e927d9417 100644 --- a/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1/selfsubjectaccessreview.go @@ -23,7 +23,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + v1 "k8s.io/api/authorization/v1" ) // SelfSubjectAccessReviewLister helps list SelfSubjectAccessReviews. diff --git a/pkg/client/listers/authorization/v1/subjectaccessreview.go b/pkg/client/listers/authorization/v1/subjectaccessreview.go index 4a36cff22aa..a3292229a1a 100644 --- a/pkg/client/listers/authorization/v1/subjectaccessreview.go +++ b/pkg/client/listers/authorization/v1/subjectaccessreview.go @@ -23,7 +23,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/authorization/v1" + v1 "k8s.io/api/authorization/v1" ) // SubjectAccessReviewLister helps list SubjectAccessReviews. diff --git a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go index 40b3278cb5b..7596f6c15b9 100644 --- a/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/localsubjectaccessreview.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + v1beta1 "k8s.io/api/authorization/v1beta1" ) // LocalSubjectAccessReviewLister helps list LocalSubjectAccessReviews. diff --git a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go index 197e15b5c83..d79fc4ac155 100644 --- a/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/selfsubjectaccessreview.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + v1beta1 "k8s.io/api/authorization/v1beta1" ) // SelfSubjectAccessReviewLister helps list SelfSubjectAccessReviews. diff --git a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go b/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go index b4b877d936f..02fcd87c787 100644 --- a/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go +++ b/pkg/client/listers/authorization/v1beta1/subjectaccessreview.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + v1beta1 "k8s.io/api/authorization/v1beta1" ) // SubjectAccessReviewLister helps list SubjectAccessReviews. diff --git a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go index 16e429c8cc3..678532eaf65 100644 --- a/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/pkg/client/listers/autoscaling/v1/horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" ) // HorizontalPodAutoscalerLister helps list HorizontalPodAutoscalers. diff --git a/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 6015de88c43..4f94f98df62 100644 --- a/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/pkg/client/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" ) // HorizontalPodAutoscalerLister helps list HorizontalPodAutoscalers. diff --git a/pkg/client/listers/batch/v1/job.go b/pkg/client/listers/batch/v1/job.go index 63388500728..2fc2deb4916 100644 --- a/pkg/client/listers/batch/v1/job.go +++ b/pkg/client/listers/batch/v1/job.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" ) // JobLister helps list Jobs. diff --git a/pkg/client/listers/batch/v1/job_expansion.go b/pkg/client/listers/batch/v1/job_expansion.go index e3d417603fa..7359ecb9253 100644 --- a/pkg/client/listers/batch/v1/job_expansion.go +++ b/pkg/client/listers/batch/v1/job_expansion.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" ) // JobListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/batch/v2alpha1/cronjob.go b/pkg/client/listers/batch/v2alpha1/cronjob.go index 46043bc5223..bc1c2c455ff 100644 --- a/pkg/client/listers/batch/v2alpha1/cronjob.go +++ b/pkg/client/listers/batch/v2alpha1/cronjob.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" ) // CronJobLister helps list CronJobs. diff --git a/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go b/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go index 5dba8ae5178..17fe4159a1c 100644 --- a/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/pkg/client/listers/certificates/v1beta1/certificatesigningrequest.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" ) // CertificateSigningRequestLister helps list CertificateSigningRequests. diff --git a/pkg/client/listers/extensions/v1beta1/daemonset.go b/pkg/client/listers/extensions/v1beta1/daemonset.go index fd4c6e7f13d..795ee196537 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset.go +++ b/pkg/client/listers/extensions/v1beta1/daemonset.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // DaemonSetLister helps list DaemonSets. diff --git a/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go b/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go index 558c16b07b6..51b91af2780 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go +++ b/pkg/client/listers/extensions/v1beta1/daemonset_expansion.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + "k8s.io/api/extensions/v1beta1" ) // DaemonSetListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/extensions/v1beta1/daemonset_expansion_test.go b/pkg/client/listers/extensions/v1beta1/daemonset_expansion_test.go index e55a7161d6a..f505214db4d 100644 --- a/pkg/client/listers/extensions/v1beta1/daemonset_expansion_test.go +++ b/pkg/client/listers/extensions/v1beta1/daemonset_expansion_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) func TestDaemonSetLister(t *testing.T) { diff --git a/pkg/client/listers/extensions/v1beta1/deployment.go b/pkg/client/listers/extensions/v1beta1/deployment.go index a128c363bc4..263e1358700 100644 --- a/pkg/client/listers/extensions/v1beta1/deployment.go +++ b/pkg/client/listers/extensions/v1beta1/deployment.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // DeploymentLister helps list Deployments. diff --git a/pkg/client/listers/extensions/v1beta1/deployment_expansion.go b/pkg/client/listers/extensions/v1beta1/deployment_expansion.go index f658423dd6f..f3a76f96540 100644 --- a/pkg/client/listers/extensions/v1beta1/deployment_expansion.go +++ b/pkg/client/listers/extensions/v1beta1/deployment_expansion.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) // DeploymentListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/extensions/v1beta1/ingress.go b/pkg/client/listers/extensions/v1beta1/ingress.go index 7607e8e6493..50be2345eaa 100644 --- a/pkg/client/listers/extensions/v1beta1/ingress.go +++ b/pkg/client/listers/extensions/v1beta1/ingress.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // IngressLister helps list Ingresses. diff --git a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go b/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go index f9f6a789e5d..618ed5f0ec4 100644 --- a/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/pkg/client/listers/extensions/v1beta1/podsecuritypolicy.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // PodSecurityPolicyLister helps list PodSecurityPolicies. diff --git a/pkg/client/listers/extensions/v1beta1/replicaset.go b/pkg/client/listers/extensions/v1beta1/replicaset.go index 4ce63df6f53..1d9a4b1926a 100644 --- a/pkg/client/listers/extensions/v1beta1/replicaset.go +++ b/pkg/client/listers/extensions/v1beta1/replicaset.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // ReplicaSetLister helps list ReplicaSets. diff --git a/pkg/client/listers/extensions/v1beta1/replicaset_expansion.go b/pkg/client/listers/extensions/v1beta1/replicaset_expansion.go index dbcc22b0e27..01c25557223 100644 --- a/pkg/client/listers/extensions/v1beta1/replicaset_expansion.go +++ b/pkg/client/listers/extensions/v1beta1/replicaset_expansion.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) // ReplicaSetListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/extensions/v1beta1/scale.go b/pkg/client/listers/extensions/v1beta1/scale.go index 9306fa50125..654e7efb34b 100644 --- a/pkg/client/listers/extensions/v1beta1/scale.go +++ b/pkg/client/listers/extensions/v1beta1/scale.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // ScaleLister helps list Scales. diff --git a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go b/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go index 7f24863acd3..88c44ebf770 100644 --- a/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go +++ b/pkg/client/listers/extensions/v1beta1/thirdpartyresource.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" ) // ThirdPartyResourceLister helps list ThirdPartyResources. diff --git a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go b/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go index eda2191407c..473a97350f6 100644 --- a/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go +++ b/pkg/client/listers/imagepolicy/v1alpha1/imagereview.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" + v1alpha1 "k8s.io/api/imagepolicy/v1alpha1" ) // ImageReviewLister helps list ImageReviews. diff --git a/pkg/client/listers/networking/v1/networkpolicy.go b/pkg/client/listers/networking/v1/networkpolicy.go index da78889d4a5..6cb3d3f3c63 100644 --- a/pkg/client/listers/networking/v1/networkpolicy.go +++ b/pkg/client/listers/networking/v1/networkpolicy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" ) // NetworkPolicyLister helps list NetworkPolicies. diff --git a/pkg/client/listers/policy/v1beta1/eviction.go b/pkg/client/listers/policy/v1beta1/eviction.go index 4ab05df6994..4db1e153e7e 100644 --- a/pkg/client/listers/policy/v1beta1/eviction.go +++ b/pkg/client/listers/policy/v1beta1/eviction.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" ) // EvictionLister helps list Evictions. diff --git a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go b/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go index 1db86c0a1e8..4ba06ec7774 100644 --- a/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go +++ b/pkg/client/listers/policy/v1beta1/poddisruptionbudget.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" ) // PodDisruptionBudgetLister helps list PodDisruptionBudgets. diff --git a/pkg/client/listers/policy/v1beta1/poddisruptionbudget_expansion.go b/pkg/client/listers/policy/v1beta1/poddisruptionbudget_expansion.go index 2203a90682c..01f8377441a 100644 --- a/pkg/client/listers/policy/v1beta1/poddisruptionbudget_expansion.go +++ b/pkg/client/listers/policy/v1beta1/poddisruptionbudget_expansion.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" ) // PodDisruptionBudgetListerExpansion allows custom methods to be added to diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrole.go b/pkg/client/listers/rbac/v1alpha1/clusterrole.go index 2d1a6849a53..18b804e7de8 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrole.go +++ b/pkg/client/listers/rbac/v1alpha1/clusterrole.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // ClusterRoleLister helps list ClusterRoles. diff --git a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go b/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go index 4aa41409d45..ac44b2d5070 100644 --- a/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/clusterrolebinding.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // ClusterRoleBindingLister helps list ClusterRoleBindings. diff --git a/pkg/client/listers/rbac/v1alpha1/role.go b/pkg/client/listers/rbac/v1alpha1/role.go index adff34cd528..ecaa5ec6a38 100644 --- a/pkg/client/listers/rbac/v1alpha1/role.go +++ b/pkg/client/listers/rbac/v1alpha1/role.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // RoleLister helps list Roles. diff --git a/pkg/client/listers/rbac/v1alpha1/rolebinding.go b/pkg/client/listers/rbac/v1alpha1/rolebinding.go index 159207af9f5..2906faac7e2 100644 --- a/pkg/client/listers/rbac/v1alpha1/rolebinding.go +++ b/pkg/client/listers/rbac/v1alpha1/rolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" ) // RoleBindingLister helps list RoleBindings. diff --git a/pkg/client/listers/rbac/v1beta1/clusterrole.go b/pkg/client/listers/rbac/v1beta1/clusterrole.go index a9dfcdca177..a4fc93dff9a 100644 --- a/pkg/client/listers/rbac/v1beta1/clusterrole.go +++ b/pkg/client/listers/rbac/v1beta1/clusterrole.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // ClusterRoleLister helps list ClusterRoles. diff --git a/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go b/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go index 9a795f30d1e..09979cc1ead 100644 --- a/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go +++ b/pkg/client/listers/rbac/v1beta1/clusterrolebinding.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // ClusterRoleBindingLister helps list ClusterRoleBindings. diff --git a/pkg/client/listers/rbac/v1beta1/role.go b/pkg/client/listers/rbac/v1beta1/role.go index c340a38f6e8..f6e630fbc81 100644 --- a/pkg/client/listers/rbac/v1beta1/role.go +++ b/pkg/client/listers/rbac/v1beta1/role.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // RoleLister helps list Roles. diff --git a/pkg/client/listers/rbac/v1beta1/rolebinding.go b/pkg/client/listers/rbac/v1beta1/rolebinding.go index 0298ee5244e..b4280ee4fdd 100644 --- a/pkg/client/listers/rbac/v1beta1/rolebinding.go +++ b/pkg/client/listers/rbac/v1beta1/rolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" ) // RoleBindingLister helps list RoleBindings. diff --git a/pkg/client/listers/settings/v1alpha1/podpreset.go b/pkg/client/listers/settings/v1alpha1/podpreset.go index 6eaad138a3a..562817beb6b 100644 --- a/pkg/client/listers/settings/v1alpha1/podpreset.go +++ b/pkg/client/listers/settings/v1alpha1/podpreset.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" ) // PodPresetLister helps list PodPresets. diff --git a/pkg/client/listers/storage/v1/storageclass.go b/pkg/client/listers/storage/v1/storageclass.go index f41e47ddfe1..6ddcfacd15d 100644 --- a/pkg/client/listers/storage/v1/storageclass.go +++ b/pkg/client/listers/storage/v1/storageclass.go @@ -23,7 +23,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1 "k8s.io/kubernetes/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" ) // StorageClassLister helps list StorageClasses. diff --git a/pkg/client/listers/storage/v1beta1/storageclass.go b/pkg/client/listers/storage/v1beta1/storageclass.go index b9a3a8b51bb..8325dd7439b 100644 --- a/pkg/client/listers/storage/v1beta1/storageclass.go +++ b/pkg/client/listers/storage/v1beta1/storageclass.go @@ -23,7 +23,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" ) // StorageClassLister helps list StorageClasses. diff --git a/pkg/controller/certificates/approver/sarapprove.go b/pkg/controller/certificates/approver/sarapprove.go index 26832c3d36a..982b2cc26c9 100644 --- a/pkg/controller/certificates/approver/sarapprove.go +++ b/pkg/controller/certificates/approver/sarapprove.go @@ -23,9 +23,10 @@ import ( "reflect" "strings" + authorization "k8s.io/api/authorization/v1beta1" + capi "k8s.io/api/certificates/v1beta1" utilfeature "k8s.io/apiserver/pkg/util/feature" - authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + k8s_certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1" "k8s.io/kubernetes/pkg/controller/certificates" @@ -85,7 +86,7 @@ func (a *sarApprover) handle(csr *capi.CertificateSigningRequest) error { if approved, denied := certificates.GetCertApprovalCondition(&csr.Status); approved || denied { return nil } - x509cr, err := capi.ParseCSR(csr) + x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr) if err != nil { return fmt.Errorf("unable to parse csr %q: %v", csr.Name, err) } diff --git a/pkg/controller/certificates/approver/sarapprove_test.go b/pkg/controller/certificates/approver/sarapprove_test.go index b5842d8dc66..d22651a6831 100644 --- a/pkg/controller/certificates/approver/sarapprove_test.go +++ b/pkg/controller/certificates/approver/sarapprove_test.go @@ -27,11 +27,12 @@ import ( "net" "testing" + authorization "k8s.io/api/authorization/v1beta1" + capi "k8s.io/api/certificates/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" testclient "k8s.io/client-go/testing" - authorization "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + k8s_certificates_v1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" ) @@ -244,7 +245,7 @@ func TestSelfNodeServerCertRecognizer(t *testing.T) { for _, tc := range testCases { t.Run(tc.description, func(t *testing.T) { csr := makeFancyTestCsr(tc.csrBuilder) - x509cr, err := capi.ParseCSR(csr) + x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr) if err != nil { t.Errorf("unexpected err: %v", err) } @@ -311,7 +312,7 @@ func testRecognizer(t *testing.T, cases []func(b *csrBuilder), recognizeFunc fun c(&b) t.Run(fmt.Sprintf("csr:%#v", b), func(t *testing.T) { csr := makeFancyTestCsr(b) - x509cr, err := capi.ParseCSR(csr) + x509cr, err := k8s_certificates_v1beta1.ParseCSR(csr) if err != nil { t.Errorf("unexpected err: %v", err) } diff --git a/pkg/controller/certificates/certificate_controller.go b/pkg/controller/certificates/certificate_controller.go index db5ff663623..0f485d691a2 100644 --- a/pkg/controller/certificates/certificate_controller.go +++ b/pkg/controller/certificates/certificate_controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1" certificateslisters "k8s.io/kubernetes/pkg/client/listers/certificates/v1beta1" diff --git a/pkg/controller/certificates/certificate_controller_test.go b/pkg/controller/certificates/certificate_controller_test.go index 2d5af915433..9a288d5b10f 100644 --- a/pkg/controller/certificates/certificate_controller_test.go +++ b/pkg/controller/certificates/certificate_controller_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/certificates/certificate_controller_utils.go b/pkg/controller/certificates/certificate_controller_utils.go index b405ae3ce8d..4a5d0d4f2bb 100644 --- a/pkg/controller/certificates/certificate_controller_utils.go +++ b/pkg/controller/certificates/certificate_controller_utils.go @@ -16,7 +16,7 @@ limitations under the License. package certificates -import certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" +import certificates "k8s.io/api/certificates/v1beta1" // IsCertificateRequestApproved returns true if a certificate request has the // "Approved" condition and no "Denied" conditions; false otherwise. diff --git a/pkg/controller/certificates/signer/cfssl_signer.go b/pkg/controller/certificates/signer/cfssl_signer.go index 11ab339d666..6f29d5e3f8e 100644 --- a/pkg/controller/certificates/signer/cfssl_signer.go +++ b/pkg/controller/certificates/signer/cfssl_signer.go @@ -25,7 +25,7 @@ import ( "os" "time" - capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + capi "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" certificatesinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/certificates/v1beta1" "k8s.io/kubernetes/pkg/controller/certificates" diff --git a/pkg/controller/certificates/signer/cfssl_signer_test.go b/pkg/controller/certificates/signer/cfssl_signer_test.go index 8ba6c95da42..ad418415e54 100644 --- a/pkg/controller/certificates/signer/cfssl_signer_test.go +++ b/pkg/controller/certificates/signer/cfssl_signer_test.go @@ -24,7 +24,7 @@ import ( "time" "k8s.io/client-go/util/cert" - capi "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + capi "k8s.io/api/certificates/v1beta1" ) func TestSigner(t *testing.T) { diff --git a/pkg/controller/client_builder.go b/pkg/controller/client_builder.go index ebc8aee2da0..c44673c02a2 100644 --- a/pkg/controller/client_builder.go +++ b/pkg/controller/client_builder.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - v1authenticationapi "k8s.io/kubernetes/pkg/apis/authentication/v1" + v1authenticationapi "k8s.io/api/authentication/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1authentication "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authentication/v1" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" diff --git a/pkg/controller/controller_ref_manager.go b/pkg/controller/controller_ref_manager.go index 79cca483512..bc6ac5148d6 100644 --- a/pkg/controller/controller_ref_manager.go +++ b/pkg/controller/controller_ref_manager.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) // GetControllerOf returns the controllerRef if controllee has a controller, diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go index 8b3df005f17..4175f9186f8 100644 --- a/pkg/controller/controller_utils.go +++ b/pkg/controller/controller_utils.go @@ -45,7 +45,7 @@ import ( podutil "k8s.io/kubernetes/pkg/api/v1/pod" "k8s.io/kubernetes/pkg/api/v1/ref" "k8s.io/kubernetes/pkg/api/validation" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" clientretry "k8s.io/kubernetes/pkg/client/retry" hashutil "k8s.io/kubernetes/pkg/util/hash" diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index ae6ec989c0d..5aa9c08a6fc 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/securitycontext" ) diff --git a/pkg/controller/cronjob/cronjob_controller.go b/pkg/controller/cronjob/cronjob_controller.go index 9419104a073..c0de344d1b3 100644 --- a/pkg/controller/cronjob/cronjob_controller.go +++ b/pkg/controller/cronjob/cronjob_controller.go @@ -48,8 +48,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/api/v1/ref" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/util/metrics" ) diff --git a/pkg/controller/cronjob/cronjob_controller_test.go b/pkg/controller/cronjob/cronjob_controller_test.go index 7c2b745bddd..03c73ffbd33 100644 --- a/pkg/controller/cronjob/cronjob_controller_test.go +++ b/pkg/controller/cronjob/cronjob_controller_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/controller" ) diff --git a/pkg/controller/cronjob/injection.go b/pkg/controller/cronjob/injection.go index d5ce06234d8..d6f930a011a 100644 --- a/pkg/controller/cronjob/injection.go +++ b/pkg/controller/cronjob/injection.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/pkg/controller/cronjob/utils.go b/pkg/controller/cronjob/utils.go index 7ed5444bae5..b90ecf6b3fd 100644 --- a/pkg/controller/cronjob/utils.go +++ b/pkg/controller/cronjob/utils.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/api/v1/ref" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/controller" ) diff --git a/pkg/controller/cronjob/utils_test.go b/pkg/controller/cronjob/utils_test.go index c96868e5438..e0f4f4e4448 100644 --- a/pkg/controller/cronjob/utils_test.go +++ b/pkg/controller/cronjob/utils_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/api/core/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/controller" ) diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index 62832637c09..ba2de80ec5a 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -39,8 +39,8 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1" diff --git a/pkg/controller/daemon/daemoncontroller_test.go b/pkg/controller/daemon/daemoncontroller_test.go index 7d37bbd47aa..e9d40543c68 100644 --- a/pkg/controller/daemon/daemoncontroller_test.go +++ b/pkg/controller/daemon/daemoncontroller_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/daemon/update.go b/pkg/controller/daemon/update.go index 5ce338820a8..5be3411ad3b 100644 --- a/pkg/controller/daemon/update.go +++ b/pkg/controller/daemon/update.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/daemon/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" diff --git a/pkg/controller/daemon/update_test.go b/pkg/controller/daemon/update_test.go index 1eeaf7bc068..0ef7d1cb857 100644 --- a/pkg/controller/daemon/update_test.go +++ b/pkg/controller/daemon/update_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) func TestDaemonSetUpdatesPods(t *testing.T) { diff --git a/pkg/controller/daemon/util/daemonset_util.go b/pkg/controller/daemon/util/daemonset_util.go index 35e2074d895..0ec266cdc39 100644 --- a/pkg/controller/daemon/util/daemonset_util.go +++ b/pkg/controller/daemon/util/daemonset_util.go @@ -24,7 +24,7 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" labelsutil "k8s.io/kubernetes/pkg/util/labels" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) diff --git a/pkg/controller/daemon/util/daemonset_util_test.go b/pkg/controller/daemon/util/daemonset_util_test.go index c7edc7e22f6..a84201176fe 100644 --- a/pkg/controller/daemon/util/daemonset_util_test.go +++ b/pkg/controller/daemon/util/daemonset_util_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) func newPod(podName string, nodeName string, label map[string]string) *v1.Pod { diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 5b6a10c7da4..145b9f94d08 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -40,7 +40,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index d7791f8ea40..f1927f7262c 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/pkg/controller/deployment/deployment_controller_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/deployment/progress.go b/pkg/controller/deployment/progress.go index ea1e92384ef..978277beb40 100644 --- a/pkg/controller/deployment/progress.go +++ b/pkg/controller/deployment/progress.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/controller/deployment/progress_test.go b/pkg/controller/deployment/progress_test.go index 6cb26f1a067..bb5e866e1de 100644 --- a/pkg/controller/deployment/progress_test.go +++ b/pkg/controller/deployment/progress_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/controller/deployment/recreate.go b/pkg/controller/deployment/recreate.go index 2172074142f..aee9dbe1c77 100644 --- a/pkg/controller/deployment/recreate.go +++ b/pkg/controller/deployment/recreate.go @@ -19,7 +19,7 @@ package deployment import ( "k8s.io/apimachinery/pkg/types" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/controller/deployment/recreate_test.go b/pkg/controller/deployment/recreate_test.go index 1cf95956011..4fadb73879f 100644 --- a/pkg/controller/deployment/recreate_test.go +++ b/pkg/controller/deployment/recreate_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/deployment/rollback.go b/pkg/controller/deployment/rollback.go index fdeee371c78..444ee49b63e 100644 --- a/pkg/controller/deployment/rollback.go +++ b/pkg/controller/deployment/rollback.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/controller/deployment/rolling.go b/pkg/controller/deployment/rolling.go index 8a7056753e1..48fb46d04de 100644 --- a/pkg/controller/deployment/rolling.go +++ b/pkg/controller/deployment/rolling.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/integer" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" ) diff --git a/pkg/controller/deployment/rolling_test.go b/pkg/controller/deployment/rolling_test.go index 7eec433683c..6334f763b8a 100644 --- a/pkg/controller/deployment/rolling_test.go +++ b/pkg/controller/deployment/rolling_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/record" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" ) diff --git a/pkg/controller/deployment/sync.go b/pkg/controller/deployment/sync.go index 63e8cd3086c..5eec622b347 100644 --- a/pkg/controller/deployment/sync.go +++ b/pkg/controller/deployment/sync.go @@ -29,7 +29,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" diff --git a/pkg/controller/deployment/sync_test.go b/pkg/controller/deployment/sync_test.go index 8f889697853..ad71fc5b722 100644 --- a/pkg/controller/deployment/sync_test.go +++ b/pkg/controller/deployment/sync_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" testclient "k8s.io/client-go/testing" "k8s.io/client-go/tools/record" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/deployment/util/deployment_util.go b/pkg/controller/deployment/util/deployment_util.go index 737029b4683..2a98006f0ca 100644 --- a/pkg/controller/deployment/util/deployment_util.go +++ b/pkg/controller/deployment/util/deployment_util.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" internalextensions "k8s.io/kubernetes/pkg/apis/extensions" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" diff --git a/pkg/controller/deployment/util/deployment_util_test.go b/pkg/controller/deployment/util/deployment_util_test.go index 9881b6321ed..9039bc16376 100644 --- a/pkg/controller/deployment/util/deployment_util_test.go +++ b/pkg/controller/deployment/util/deployment_util_test.go @@ -34,7 +34,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/controller" ) diff --git a/pkg/controller/deployment/util/replicaset_util.go b/pkg/controller/deployment/util/replicaset_util.go index 0f41ad0b14c..543116ee3b1 100644 --- a/pkg/controller/deployment/util/replicaset_util.go +++ b/pkg/controller/deployment/util/replicaset_util.go @@ -24,7 +24,7 @@ import ( errorsutil "k8s.io/apimachinery/pkg/util/errors" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" extensionslisters "k8s.io/kubernetes/pkg/client/listers/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/retry" diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 897a07f3915..2be0fd83922 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + apps "k8s.io/api/apps/v1beta1" + "k8s.io/api/extensions/v1beta1" + policy "k8s.io/api/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" policyclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/policy/v1beta1" appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1" diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index e17611030d7..716d1cd0fe6 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - policy "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" + policy "k8s.io/api/policy/v1beta1" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/history/controller_history.go b/pkg/controller/history/controller_history.go index 55ae429d1d2..d2183e41a42 100644 --- a/pkg/controller/history/controller_history.go +++ b/pkg/controller/history/controller_history.go @@ -23,7 +23,7 @@ import ( "sort" "strconv" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1" appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" diff --git a/pkg/controller/history/controller_history_test.go b/pkg/controller/history/controller_history_test.go index 5cd0f409613..4ba15e78396 100644 --- a/pkg/controller/history/controller_history_test.go +++ b/pkg/controller/history/controller_history_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index 58064fa2e67..94d8543e374 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -35,7 +35,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" batchinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/batch/v1" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index bfe9dc5f65b..d226f63e660 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/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" diff --git a/pkg/controller/job/utils.go b/pkg/controller/job/utils.go index 6c838ea5422..a2d5534c96f 100644 --- a/pkg/controller/job/utils.go +++ b/pkg/controller/job/utils.go @@ -19,7 +19,7 @@ package job import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" ) func IsJobFinished(j *batch.Job) bool { diff --git a/pkg/controller/job/utils_test.go b/pkg/controller/job/utils_test.go index 80f9afbc0a3..4d7f4ac4bdc 100644 --- a/pkg/controller/job/utils_test.go +++ b/pkg/controller/job/utils_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" ) func TestIsJobFinished(t *testing.T) { diff --git a/pkg/controller/node/nodecontroller_test.go b/pkg/controller/node/nodecontroller_test.go index 43b3019ace4..91f0a6ebf62 100644 --- a/pkg/controller/node/nodecontroller_test.go +++ b/pkg/controller/node/nodecontroller_test.go @@ -31,7 +31,7 @@ import ( testcore "k8s.io/client-go/testing" "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "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/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 0eea13df824..2e1060a02b5 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -38,9 +38,9 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + autoscalingv2 "k8s.io/api/autoscaling/v2alpha1" + extensions "k8s.io/api/extensions/v1beta1" autoscalingclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/autoscaling/v1" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" autoscalinginformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/autoscaling/v1" diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 758383ed386..ff436b77200 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + autoscalingv2 "k8s.io/api/autoscaling/v2alpha1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/podautoscaler/legacy_horizontal_test.go b/pkg/controller/podautoscaler/legacy_horizontal_test.go index fd5af82038d..9128cecabdd 100644 --- a/pkg/controller/podautoscaler/legacy_horizontal_test.go +++ b/pkg/controller/podautoscaler/legacy_horizontal_test.go @@ -36,9 +36,9 @@ import ( restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/api/core/v1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscalingv1 "k8s.io/api/autoscaling/v1" + autoscalingv2 "k8s.io/api/autoscaling/v2alpha1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/podautoscaler/metrics/interfaces.go b/pkg/controller/podautoscaler/metrics/interfaces.go index 5e80ece3ab5..3e884a90489 100644 --- a/pkg/controller/podautoscaler/metrics/interfaces.go +++ b/pkg/controller/podautoscaler/metrics/interfaces.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscaling "k8s.io/api/autoscaling/v2alpha1" ) // PodMetricsInfo contains pod metric values as a map from pod names to diff --git a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go index edb0431574e..5babd61d9a0 100644 --- a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/labels" clientgov1 "k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1" - autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscaling "k8s.io/api/autoscaling/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" v1core "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" ) diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go index b4e3fe5de77..259e2d88a09 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1" - autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscaling "k8s.io/api/autoscaling/v2alpha1" customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1" resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1" customclient "k8s.io/metrics/pkg/client/custom_metrics" diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index 252cd3fe228..aaab9c7217c 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -30,7 +30,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" kv1 "k8s.io/api/core/v1" - autoscalingapi "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscalingapi "k8s.io/api/autoscaling/v2alpha1" metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake" cmfake "k8s.io/metrics/pkg/client/custom_metrics/fake" diff --git a/pkg/controller/podautoscaler/replica_calculator.go b/pkg/controller/podautoscaler/replica_calculator.go index aa82a8e4470..80d12aafd25 100644 --- a/pkg/controller/podautoscaler/replica_calculator.go +++ b/pkg/controller/podautoscaler/replica_calculator.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscaling "k8s.io/api/autoscaling/v2alpha1" v1coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" metricsclient "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" ) diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index 5399edf1f8f..c609393e601 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -30,7 +30,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - autoscalingv2 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscalingv2 "k8s.io/api/autoscaling/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" "k8s.io/kubernetes/pkg/controller/podautoscaler/metrics" metricsfake "k8s.io/metrics/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index ba608c75332..592f9b7f38e 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -39,8 +39,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" extensionsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/extensions/v1beta1" diff --git a/pkg/controller/replicaset/replica_set_test.go b/pkg/controller/replicaset/replica_set_test.go index 71bd7fcf7d1..4dd960519d5 100644 --- a/pkg/controller/replicaset/replica_set_test.go +++ b/pkg/controller/replicaset/replica_set_test.go @@ -44,7 +44,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" fakeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/controller/replicaset/replica_set_utils.go b/pkg/controller/replicaset/replica_set_utils.go index 0030366feed..f0fb11155d9 100644 --- a/pkg/controller/replicaset/replica_set_utils.go +++ b/pkg/controller/replicaset/replica_set_utils.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" unversionedextensions "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" ) diff --git a/pkg/controller/statefulset/stateful_pod_control.go b/pkg/controller/statefulset/stateful_pod_control.go index edb73890c84..8202bceb76c 100644 --- a/pkg/controller/statefulset/stateful_pod_control.go +++ b/pkg/controller/statefulset/stateful_pod_control.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1" diff --git a/pkg/controller/statefulset/stateful_set.go b/pkg/controller/statefulset/stateful_set.go index 5177da04c14..737b8880d66 100644 --- a/pkg/controller/statefulset/stateful_set.go +++ b/pkg/controller/statefulset/stateful_set.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" appsinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/apps/v1beta1" coreinformers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions/core/v1" diff --git a/pkg/controller/statefulset/stateful_set_control.go b/pkg/controller/statefulset/stateful_set_control.go index d242f2da9aa..cdd1c7c23fa 100644 --- a/pkg/controller/statefulset/stateful_set_control.go +++ b/pkg/controller/statefulset/stateful_set_control.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/controller/history" "github.com/golang/glog" diff --git a/pkg/controller/statefulset/stateful_set_control_test.go b/pkg/controller/statefulset/stateful_set_control_test.go index 5f01545c608..e76011374eb 100644 --- a/pkg/controller/statefulset/stateful_set_control_test.go +++ b/pkg/controller/statefulset/stateful_set_control_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "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/statefulset/stateful_set_status_updater.go b/pkg/controller/statefulset/stateful_set_status_updater.go index f1a2f5c268a..70f604cdaad 100644 --- a/pkg/controller/statefulset/stateful_set_status_updater.go +++ b/pkg/controller/statefulset/stateful_set_status_updater.go @@ -22,7 +22,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/kubernetes/scheme" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" diff --git a/pkg/controller/statefulset/stateful_set_status_updater_test.go b/pkg/controller/statefulset/stateful_set_status_updater_test.go index 3bdefb8e66b..b1cfd11d00d 100644 --- a/pkg/controller/statefulset/stateful_set_status_updater_test.go +++ b/pkg/controller/statefulset/stateful_set_status_updater_test.go @@ -26,7 +26,7 @@ import ( core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" appslisters "k8s.io/kubernetes/pkg/client/listers/apps/v1beta1" ) diff --git a/pkg/controller/statefulset/stateful_set_test.go b/pkg/controller/statefulset/stateful_set_test.go index c5f9b10fbe1..e11f8714fb6 100644 --- a/pkg/controller/statefulset/stateful_set_test.go +++ b/pkg/controller/statefulset/stateful_set_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/controller/statefulset/stateful_set_utils.go b/pkg/controller/statefulset/stateful_set_utils.go index 60fc8815920..61f6491686c 100644 --- a/pkg/controller/statefulset/stateful_set_utils.go +++ b/pkg/controller/statefulset/stateful_set_utils.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/history" diff --git a/pkg/controller/statefulset/stateful_set_utils_test.go b/pkg/controller/statefulset/stateful_set_utils_test.go index ae452299878..3ec9a85893b 100644 --- a/pkg/controller/statefulset/stateful_set_utils_test.go +++ b/pkg/controller/statefulset/stateful_set_utils_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/history" ) diff --git a/pkg/controller/volume/persistentvolume/binder_test.go b/pkg/controller/volume/persistentvolume/binder_test.go index 7861466ccf8..6f000e9edde 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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 afa1ecf6e75..7c3497f4835 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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 d430108607f..582c71a846a 100644 --- a/pkg/controller/volume/persistentvolume/framework_test.go +++ b/pkg/controller/volume/persistentvolume/framework_test.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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" diff --git a/pkg/controller/volume/persistentvolume/provision_test.go b/pkg/controller/volume/persistentvolume/provision_test.go index 6a749d97596..d23e62edce4 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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 14bf1af15e7..158b2b64139 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller.go +++ b/pkg/controller/volume/persistentvolume/pv_controller.go @@ -30,7 +30,7 @@ import ( "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" "k8s.io/kubernetes/pkg/api/v1/ref" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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/v1" diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index 6f6f68cac80..dd849a09a42 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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/v1" diff --git a/pkg/controller/volume/persistentvolume/recycle_test.go b/pkg/controller/volume/persistentvolume/recycle_test.go index e0240a9658b..0ef075f624a 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/storage/v1" ) // Test single call to syncVolume, expecting recycling to happen. diff --git a/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go b/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go index 64d4bd37589..4d6056d7470 100644 --- a/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go +++ b/pkg/kubeapiserver/admission/configuration/external_admission_hook_manager.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" ) type ExternalAdmissionHookConfigurationLister interface { diff --git a/pkg/kubeapiserver/admission/configuration/initializer_manager.go b/pkg/kubeapiserver/admission/configuration/initializer_manager.go index 86f4de0a562..de8ce8a1513 100644 --- a/pkg/kubeapiserver/admission/configuration/initializer_manager.go +++ b/pkg/kubeapiserver/admission/configuration/initializer_manager.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" ) type InitializerConfigurationLister interface { diff --git a/pkg/kubeapiserver/admission/configuration/initializer_manager_test.go b/pkg/kubeapiserver/admission/configuration/initializer_manager_test.go index b9d1e799138..2572cbd62d4 100644 --- a/pkg/kubeapiserver/admission/configuration/initializer_manager_test.go +++ b/pkg/kubeapiserver/admission/configuration/initializer_manager_test.go @@ -23,7 +23,7 @@ import ( "time" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" ) type mockLister struct { diff --git a/pkg/kubeapiserver/default_storage_factory_builder_test.go b/pkg/kubeapiserver/default_storage_factory_builder_test.go index 8f5ede9443c..99d7ff368ef 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder_test.go +++ b/pkg/kubeapiserver/default_storage_factory_builder_test.go @@ -26,7 +26,7 @@ import ( _ "k8s.io/kubernetes/pkg/api/install" apiv1 "k8s.io/api/core/v1" _ "k8s.io/kubernetes/pkg/apis/extensions/install" - extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" ) func TestParseRuntimeConfig(t *testing.T) { diff --git a/pkg/kubectl/cmd/create_deployment.go b/pkg/kubectl/cmd/create_deployment.go index aabc69ddfb9..b3393788e67 100644 --- a/pkg/kubectl/cmd/create_deployment.go +++ b/pkg/kubectl/cmd/create_deployment.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/pkg/kubectl/cmd/run.go b/pkg/kubectl/cmd/run.go index 1c361df94d3..34538e68d81 100644 --- a/pkg/kubectl/cmd/run.go +++ b/pkg/kubectl/cmd/run.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" "k8s.io/kubernetes/pkg/api" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" conditions "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/kubectl" diff --git a/pkg/kubectl/deployment.go b/pkg/kubectl/deployment.go index f9cf872a760..0eeee1907b6 100644 --- a/pkg/kubectl/deployment.go +++ b/pkg/kubectl/deployment.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) // DeploymentBasicGeneratorV1 supports stable generation of a deployment diff --git a/pkg/kubectl/deployment_test.go b/pkg/kubectl/deployment_test.go index c1ba27847d8..fe629994578 100644 --- a/pkg/kubectl/deployment_test.go +++ b/pkg/kubectl/deployment_test.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) func TestDeploymentGenerate(t *testing.T) { diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index 8448ed5dc33..95ba698778a 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/api" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/apps" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/apis/extensions" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" externalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller" diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index 9169ba7cc45..e61c9e9a816 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -33,9 +33,9 @@ import ( "k8s.io/kubernetes/pkg/api" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/apps" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/apis/extensions" - externalextensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + externalextensions "k8s.io/api/extensions/v1beta1" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/controller/daemon" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" diff --git a/pkg/kubectl/run.go b/pkg/kubectl/run.go index 6b4a7f4e9c5..6244f7e7c4e 100644 --- a/pkg/kubectl/run.go +++ b/pkg/kubectl/run.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) type DeploymentV1Beta1 struct{} diff --git a/pkg/kubectl/run_test.go b/pkg/kubectl/run_test.go index a4a1b927dc7..73e3a0112c9 100644 --- a/pkg/kubectl/run_test.go +++ b/pkg/kubectl/run_test.go @@ -23,10 +23,10 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" - extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" + extensionsv1beta1 "k8s.io/api/extensions/v1beta1" ) func TestGenerate(t *testing.T) { diff --git a/pkg/kubelet/certificate/certificate_manager.go b/pkg/kubelet/certificate/certificate_manager.go index c381010902b..ebe22b12e6a 100644 --- a/pkg/kubelet/certificate/certificate_manager.go +++ b/pkg/kubelet/certificate/certificate_manager.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/util/cert" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" certificatesclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" ) diff --git a/pkg/kubelet/certificate/certificate_manager_test.go b/pkg/kubelet/certificate/certificate_manager_test.go index f6c5c913be5..369fb7caa9d 100644 --- a/pkg/kubelet/certificate/certificate_manager_test.go +++ b/pkg/kubelet/certificate/certificate_manager_test.go @@ -28,7 +28,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" certificatesclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index dc5b992ff98..192ddac6110 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -56,7 +56,7 @@ import ( "k8s.io/kubernetes/cmd/kubelet/app/options" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" "k8s.io/kubernetes/pkg/apis/componentconfig" componentconfigv1alpha1 "k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/pkg/master/master.go b/pkg/master/master.go index f8b725b0e0f..a754a93a9fc 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -35,22 +35,22 @@ import ( "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api" apiv1 "k8s.io/api/core/v1" - appsv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" - authorizationapiv1 "k8s.io/kubernetes/pkg/apis/authorization/v1" - authorizationapiv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - certificatesapiv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" - networkingapiv1 "k8s.io/kubernetes/pkg/apis/networking/v1" - policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" - rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - settingv1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" - storageapiv1 "k8s.io/kubernetes/pkg/apis/storage/v1" - storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + appsv1beta1 "k8s.io/api/apps/v1beta1" + authenticationv1 "k8s.io/api/authentication/v1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" + authorizationapiv1 "k8s.io/api/authorization/v1" + authorizationapiv1beta1 "k8s.io/api/authorization/v1beta1" + autoscalingapiv1 "k8s.io/api/autoscaling/v1" + batchapiv1 "k8s.io/api/batch/v1" + certificatesapiv1beta1 "k8s.io/api/certificates/v1beta1" + extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" + networkingapiv1 "k8s.io/api/networking/v1" + policyapiv1beta1 "k8s.io/api/policy/v1beta1" + rbacv1alpha1 "k8s.io/api/rbac/v1alpha1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" + settingv1alpha1 "k8s.io/api/settings/v1alpha1" + storageapiv1 "k8s.io/api/storage/v1" + storageapiv1beta1 "k8s.io/api/storage/v1beta1" corev1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/core/v1" coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 61a908ecf64..d7ecf6a61bf 100644 --- a/pkg/master/master_test.go +++ b/pkg/master/master_test.go @@ -44,15 +44,15 @@ import ( "k8s.io/kubernetes/pkg/api/testapi" apiv1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/apis/apps" - appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + appsapiv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/apis/autoscaling" - autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscalingapiv1 "k8s.io/api/autoscaling/v1" "k8s.io/kubernetes/pkg/apis/batch" - batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchapiv1 "k8s.io/api/batch/v1" + batchapiv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" - extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/rbac" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" kubeletclient "k8s.io/kubernetes/pkg/kubelet/client" diff --git a/pkg/printers/internalversion/describe.go b/pkg/printers/internalversion/describe.go index 0bf82337085..8f9f49fe3ff 100644 --- a/pkg/printers/internalversion/describe.go +++ b/pkg/printers/internalversion/describe.go @@ -57,7 +57,7 @@ import ( "k8s.io/kubernetes/pkg/apis/batch" "k8s.io/kubernetes/pkg/apis/certificates" "k8s.io/kubernetes/pkg/apis/extensions" - versionedextension "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + versionedextension "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/networking" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/rbac" diff --git a/pkg/printers/internalversion/describe_test.go b/pkg/printers/internalversion/describe_test.go index 76ebb94a064..56a4336b5a3 100644 --- a/pkg/printers/internalversion/describe_test.go +++ b/pkg/printers/internalversion/describe_test.go @@ -35,7 +35,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/apis/policy" "k8s.io/kubernetes/pkg/apis/storage" versionedfake "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/fake" diff --git a/pkg/registry/admissionregistration/rest/storage_apiserver.go b/pkg/registry/admissionregistration/rest/storage_apiserver.go index a5dd06d803f..c91fe1d5344 100644 --- a/pkg/registry/admissionregistration/rest/storage_apiserver.go +++ b/pkg/registry/admissionregistration/rest/storage_apiserver.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/admissionregistration" - admissionregistrationv1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" externaladmissionhookconfigurationstorage "k8s.io/kubernetes/pkg/registry/admissionregistration/externaladmissionhookconfiguration/storage" initializerconfigurationstorage "k8s.io/kubernetes/pkg/registry/admissionregistration/initializerconfiguration/storage" ) diff --git a/pkg/registry/apps/rest/storage_apps.go b/pkg/registry/apps/rest/storage_apps.go index 339451b3d2d..44da2b1b6f3 100644 --- a/pkg/registry/apps/rest/storage_apps.go +++ b/pkg/registry/apps/rest/storage_apps.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/apps" - appsapiv1beta1 "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + appsapiv1beta1 "k8s.io/api/apps/v1beta1" controllerrevisionsstore "k8s.io/kubernetes/pkg/registry/apps/controllerrevision/storage" statefulsetstore "k8s.io/kubernetes/pkg/registry/apps/statefulset/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" diff --git a/pkg/registry/authentication/rest/storage_authentication.go b/pkg/registry/authentication/rest/storage_authentication.go index f8f47939012..9ba7e29c8a2 100644 --- a/pkg/registry/authentication/rest/storage_authentication.go +++ b/pkg/registry/authentication/rest/storage_authentication.go @@ -24,8 +24,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/authentication" - authenticationv1 "k8s.io/kubernetes/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + authenticationv1 "k8s.io/api/authentication/v1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" "k8s.io/kubernetes/pkg/registry/authentication/tokenreview" ) diff --git a/pkg/registry/authorization/rest/storage_authorization.go b/pkg/registry/authorization/rest/storage_authorization.go index a543949fb26..ed0f0c4a302 100644 --- a/pkg/registry/authorization/rest/storage_authorization.go +++ b/pkg/registry/authorization/rest/storage_authorization.go @@ -24,8 +24,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/authorization" - authorizationv1 "k8s.io/kubernetes/pkg/apis/authorization/v1" - authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" + authorizationv1 "k8s.io/api/authorization/v1" + authorizationv1beta1 "k8s.io/api/authorization/v1beta1" "k8s.io/kubernetes/pkg/registry/authorization/localsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/selfsubjectaccessreview" "k8s.io/kubernetes/pkg/registry/authorization/subjectaccessreview" diff --git a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go index 7a19981642f..60c464edb5a 100644 --- a/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go +++ b/pkg/registry/autoscaling/horizontalpodautoscaler/storage/storage_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" - _ "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + _ "k8s.io/api/autoscaling/v1" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/autoscaling/rest/storage_autoscaling.go b/pkg/registry/autoscaling/rest/storage_autoscaling.go index 5fcbfc1ad2c..f3ddd0d89ef 100644 --- a/pkg/registry/autoscaling/rest/storage_autoscaling.go +++ b/pkg/registry/autoscaling/rest/storage_autoscaling.go @@ -23,8 +23,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/autoscaling" - autoscalingapiv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - autoscalingapiv2alpha1 "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1" + autoscalingapiv1 "k8s.io/api/autoscaling/v1" + autoscalingapiv2alpha1 "k8s.io/api/autoscaling/v2alpha1" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" ) diff --git a/pkg/registry/batch/cronjob/storage/storage_test.go b/pkg/registry/batch/cronjob/storage/storage_test.go index bc5bf86cbed..7740ef9cb63 100644 --- a/pkg/registry/batch/cronjob/storage/storage_test.go +++ b/pkg/registry/batch/cronjob/storage/storage_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/apis/batch" - "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/batch/rest/storage_batch.go b/pkg/registry/batch/rest/storage_batch.go index 55582a80291..0b89ee16f7e 100644 --- a/pkg/registry/batch/rest/storage_batch.go +++ b/pkg/registry/batch/rest/storage_batch.go @@ -24,8 +24,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/batch" - batchapiv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchapiv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchapiv1 "k8s.io/api/batch/v1" + batchapiv2alpha1 "k8s.io/api/batch/v2alpha1" cronjobstore "k8s.io/kubernetes/pkg/registry/batch/cronjob/storage" jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage" ) diff --git a/pkg/registry/certificates/rest/storage_certificates.go b/pkg/registry/certificates/rest/storage_certificates.go index c03fb9ecea0..5fd10babb3f 100644 --- a/pkg/registry/certificates/rest/storage_certificates.go +++ b/pkg/registry/certificates/rest/storage_certificates.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/certificates" - certificatesapiv1beta1 "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + certificatesapiv1beta1 "k8s.io/api/certificates/v1beta1" certificatestore "k8s.io/kubernetes/pkg/registry/certificates/certificates/storage" ) diff --git a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go index ce6aa67f49a..657ed57afbd 100644 --- a/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go +++ b/pkg/registry/extensions/podsecuritypolicy/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" - _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + _ "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/extensions/rest/storage_extensions.go b/pkg/registry/extensions/rest/storage_extensions.go index ec3bdeb0cf4..60e4d75a035 100644 --- a/pkg/registry/extensions/rest/storage_extensions.go +++ b/pkg/registry/extensions/rest/storage_extensions.go @@ -30,7 +30,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/extensions" - extensionsapiv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion" expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" diff --git a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go index dd122b061e3..424ff89905f 100644 --- a/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresource/storage/storage_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" - _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + _ "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/extensions/thirdpartyresourcedata/codec.go b/pkg/registry/extensions/thirdpartyresourcedata/codec.go index f37f4cdc451..4a1fab64e3d 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/codec.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/codec.go @@ -34,7 +34,7 @@ import ( apiutil "k8s.io/kubernetes/pkg/api/util" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/apis/extensions" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) type thirdPartyObjectConverter struct { diff --git a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go index 9e6860dea8c..b413e409b76 100644 --- a/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go +++ b/pkg/registry/extensions/thirdpartyresourcedata/storage/storage_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/registry/generic" etcdtesting "k8s.io/apiserver/pkg/storage/etcd/testing" - _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + _ "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/registry/registrytest" ) diff --git a/pkg/registry/networking/rest/storage_settings.go b/pkg/registry/networking/rest/storage_settings.go index 3b773bd9e34..b874dd98ae9 100644 --- a/pkg/registry/networking/rest/storage_settings.go +++ b/pkg/registry/networking/rest/storage_settings.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/networking" - networkingapiv1 "k8s.io/kubernetes/pkg/apis/networking/v1" + networkingapiv1 "k8s.io/api/networking/v1" networkpolicystore "k8s.io/kubernetes/pkg/registry/networking/networkpolicy/storage" ) diff --git a/pkg/registry/policy/rest/storage_policy.go b/pkg/registry/policy/rest/storage_policy.go index 26a9594eebd..07705e9bbf8 100644 --- a/pkg/registry/policy/rest/storage_policy.go +++ b/pkg/registry/policy/rest/storage_policy.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/policy" - policyapiv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policyapiv1beta1 "k8s.io/api/policy/v1beta1" poddisruptionbudgetstore "k8s.io/kubernetes/pkg/registry/policy/poddisruptionbudget/storage" ) diff --git a/pkg/registry/rbac/rest/storage_rbac.go b/pkg/registry/rbac/rest/storage_rbac.go index 34df168d877..2b28e118827 100644 --- a/pkg/registry/rbac/rest/storage_rbac.go +++ b/pkg/registry/rbac/rest/storage_rbac.go @@ -34,8 +34,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/rbac" - rbacapiv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" - rbacapiv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacapiv1alpha1 "k8s.io/api/rbac/v1alpha1" + rbacapiv1beta1 "k8s.io/api/rbac/v1beta1" rbacclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/rbac/internalversion" "k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/pkg/registry/rbac/clusterrole" diff --git a/pkg/registry/settings/rest/storage_settings.go b/pkg/registry/settings/rest/storage_settings.go index 949faac847c..4656a2b8865 100644 --- a/pkg/registry/settings/rest/storage_settings.go +++ b/pkg/registry/settings/rest/storage_settings.go @@ -23,7 +23,7 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/settings" - settingsapiv1alpha1 "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + settingsapiv1alpha1 "k8s.io/api/settings/v1alpha1" podpresetstore "k8s.io/kubernetes/pkg/registry/settings/podpreset/storage" ) diff --git a/pkg/registry/storage/rest/storage_storage.go b/pkg/registry/storage/rest/storage_storage.go index 0eebcd0dbee..651889d6533 100644 --- a/pkg/registry/storage/rest/storage_storage.go +++ b/pkg/registry/storage/rest/storage_storage.go @@ -23,8 +23,8 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/kubernetes/pkg/api" storageapi "k8s.io/kubernetes/pkg/apis/storage" - storageapiv1 "k8s.io/kubernetes/pkg/apis/storage/v1" - storageapiv1beta1 "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storageapiv1 "k8s.io/api/storage/v1" + storageapiv1beta1 "k8s.io/api/storage/v1beta1" storageclassstore "k8s.io/kubernetes/pkg/registry/storage/storageclass/storage" ) diff --git a/pkg/volume/util/util.go b/pkg/volume/util/util.go index 0c47951e901..eed0bfb4a6f 100644 --- a/pkg/volume/util/util.go +++ b/pkg/volume/util/util.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/util/mount" ) diff --git a/plugin/pkg/admission/imagepolicy/admission.go b/plugin/pkg/admission/imagepolicy/admission.go index 25a2bd98cb6..45163104f43 100644 --- a/plugin/pkg/admission/imagepolicy/admission.go +++ b/plugin/pkg/admission/imagepolicy/admission.go @@ -38,7 +38,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" + "k8s.io/api/imagepolicy/v1alpha1" // install the clientgo image policy API for use with api registry _ "k8s.io/kubernetes/pkg/apis/imagepolicy/install" diff --git a/plugin/pkg/admission/imagepolicy/admission_test.go b/plugin/pkg/admission/imagepolicy/admission_test.go index caded8ffc3d..dea1b968634 100644 --- a/plugin/pkg/admission/imagepolicy/admission_test.go +++ b/plugin/pkg/admission/imagepolicy/admission_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/client-go/tools/clientcmd/api/v1" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/imagepolicy/v1alpha1" + "k8s.io/api/imagepolicy/v1alpha1" "fmt" "io/ioutil" diff --git a/plugin/pkg/admission/initialization/initialization.go b/plugin/pkg/admission/initialization/initialization.go index dff0fbe7f77..2668bd043fb 100644 --- a/plugin/pkg/admission/initialization/initialization.go +++ b/plugin/pkg/admission/initialization/initialization.go @@ -33,7 +33,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration" ) diff --git a/plugin/pkg/admission/initialization/initialization_test.go b/plugin/pkg/admission/initialization/initialization_test.go index b45844c9374..fac083feec8 100644 --- a/plugin/pkg/admission/initialization/initialization_test.go +++ b/plugin/pkg/admission/initialization/initialization_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" ) func newInitializer(name string, rules ...v1alpha1.Rule) *v1alpha1.InitializerConfiguration { diff --git a/plugin/pkg/admission/webhook/admission.go b/plugin/pkg/admission/webhook/admission.go index 6236fb4fa98..72cb761a2c8 100644 --- a/plugin/pkg/admission/webhook/admission.go +++ b/plugin/pkg/admission/webhook/admission.go @@ -37,7 +37,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" admissionv1alpha1 "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" admissioninit "k8s.io/kubernetes/pkg/kubeapiserver/admission" "k8s.io/kubernetes/pkg/kubeapiserver/admission/configuration" diff --git a/plugin/pkg/admission/webhook/admission_test.go b/plugin/pkg/admission/webhook/admission_test.go index 5e2380421bb..e0fe2f6af7a 100644 --- a/plugin/pkg/admission/webhook/admission_test.go +++ b/plugin/pkg/admission/webhook/admission_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/apis/admission/v1alpha1" - registrationv1alpha1 "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + registrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1" _ "k8s.io/kubernetes/pkg/apis/admission/install" ) diff --git a/plugin/pkg/admission/webhook/rules.go b/plugin/pkg/admission/webhook/rules.go index 70af1032205..68f0fcef1ea 100644 --- a/plugin/pkg/admission/webhook/rules.go +++ b/plugin/pkg/admission/webhook/rules.go @@ -21,7 +21,7 @@ import ( "strings" "k8s.io/apiserver/pkg/admission" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" ) type RuleMatcher struct { diff --git a/plugin/pkg/admission/webhook/rules_test.go b/plugin/pkg/admission/webhook/rules_test.go index ad063ef74ed..846cadec5bd 100644 --- a/plugin/pkg/admission/webhook/rules_test.go +++ b/plugin/pkg/admission/webhook/rules_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/admission" - adreg "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + adreg "k8s.io/api/admissionregistration/v1alpha1" ) type ruleTest struct { diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go index f041b9820e5..84ac050aee2 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/apis/rbac" _ "k8s.io/kubernetes/pkg/apis/rbac/install" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy" ) diff --git a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go index 8e1c6b2c965..06c633c47df 100644 --- a/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go +++ b/plugin/pkg/scheduler/algorithm/priorities/selector_spreading_test.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" diff --git a/plugin/pkg/scheduler/algorithm/types.go b/plugin/pkg/scheduler/algorithm/types.go index daac38119e1..82ce3d52ce1 100644 --- a/plugin/pkg/scheduler/algorithm/types.go +++ b/plugin/pkg/scheduler/algorithm/types.go @@ -19,8 +19,8 @@ package algorithm import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" schedulerapi "k8s.io/kubernetes/plugin/pkg/scheduler/api" "k8s.io/kubernetes/plugin/pkg/scheduler/schedulercache" ) diff --git a/plugin/pkg/scheduler/core/generic_scheduler_test.go b/plugin/pkg/scheduler/core/generic_scheduler_test.go index 7a4b5f8196b..6baf542e9b2 100644 --- a/plugin/pkg/scheduler/core/generic_scheduler_test.go +++ b/plugin/pkg/scheduler/core/generic_scheduler_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" algorithmpredicates "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/predicates" algorithmpriorities "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities" diff --git a/plugin/pkg/scheduler/testing/fake_lister.go b/plugin/pkg/scheduler/testing/fake_lister.go index e833a8cd43d..fd2ba394d05 100644 --- a/plugin/pkg/scheduler/testing/fake_lister.go +++ b/plugin/pkg/scheduler/testing/fake_lister.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + apps "k8s.io/api/apps/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" . "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm" ) diff --git a/test/e2e/certificates.go b/test/e2e/certificates.go index 95e19a347bf..f28e306f895 100644 --- a/test/e2e/certificates.go +++ b/test/e2e/certificates.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/cert" - "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" + "k8s.io/api/certificates/v1beta1" v1beta1client "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/certificates/v1beta1" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/common/apparmor.go b/test/e2e/common/apparmor.go index 7e88b898c57..0ae2d3d13d3 100644 --- a/test/e2e/common/apparmor.go +++ b/test/e2e/common/apparmor.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" api "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/security/apparmor" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/common/autoscaling_utils.go b/test/e2e/common/autoscaling_utils.go index 9d2576d0751..3b66cb8d718 100644 --- a/test/e2e/common/autoscaling_utils.go +++ b/test/e2e/common/autoscaling_utils.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscalingv1 "k8s.io/api/autoscaling/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/test/e2e/cronjob.go b/test/e2e/cronjob.go index ad057227896..b15c46b058f 100644 --- a/test/e2e/cronjob.go +++ b/test/e2e/cronjob.go @@ -30,8 +30,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" batchinternal "k8s.io/kubernetes/pkg/apis/batch" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/job" diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 39056a76a1c..9e320b12f30 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -32,9 +32,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller/daemon" diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 4290c2d6d5e..271f5970516 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/api/core/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 59f80ef2bd0..8ce7d89cd3f 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -34,7 +34,7 @@ import ( "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/generated" diff --git a/test/e2e/extension/initializers.go b/test/e2e/extension/initializers.go index b2c94d33f12..811c5cc588f 100644 --- a/test/e2e/extension/initializers.go +++ b/test/e2e/extension/initializers.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1" + "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" clientretry "k8s.io/kubernetes/pkg/client/retry" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/framework/authorizer_util.go b/test/e2e/framework/authorizer_util.go index 2d348ece4e3..b0d0c57c0b0 100644 --- a/test/e2e/framework/authorizer_util.go +++ b/test/e2e/framework/authorizer_util.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" - authorizationv1beta1 "k8s.io/kubernetes/pkg/apis/authorization/v1beta1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + authorizationv1beta1 "k8s.io/api/authorization/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" v1beta1authorization "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/authorization/v1beta1" v1beta1rbac "k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/rbac/v1beta1" ) diff --git a/test/e2e/framework/ingress_utils.go b/test/e2e/framework/ingress_utils.go index de747a9d380..b98c65776ab 100644 --- a/test/e2e/framework/ingress_utils.go +++ b/test/e2e/framework/ingress_utils.go @@ -49,7 +49,7 @@ import ( utilyaml "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" gcecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/gce" "k8s.io/kubernetes/pkg/util" diff --git a/test/e2e/framework/jobs_util.go b/test/e2e/framework/jobs_util.go index 682fbb1875b..97caf8aeafc 100644 --- a/test/e2e/framework/jobs_util.go +++ b/test/e2e/framework/jobs_util.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" ) diff --git a/test/e2e/framework/service_util.go b/test/e2e/framework/service_util.go index 9129a95040c..8bcfc68a01d 100644 --- a/test/e2e/framework/service_util.go +++ b/test/e2e/framework/service_util.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - policyv1beta1 "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + policyv1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/retry" diff --git a/test/e2e/framework/statefulset_utils.go b/test/e2e/framework/statefulset_utils.go index 953f23f1c44..bfffe9d80d7 100644 --- a/test/e2e/framework/statefulset_utils.go +++ b/test/e2e/framework/statefulset_utils.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/generated" ) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 30251246650..f891aa3bb4f 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -75,11 +75,11 @@ import ( v1helper "k8s.io/kubernetes/pkg/api/v1/helper" nodeutil "k8s.io/kubernetes/pkg/api/v1/node" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" batchinternal "k8s.io/kubernetes/pkg/apis/batch" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" "k8s.io/kubernetes/pkg/client/conditions" diff --git a/test/e2e/garbage_collector.go b/test/e2e/garbage_collector.go index 2f6b4836bde..1be140c8fd5 100644 --- a/test/e2e/garbage_collector.go +++ b/test/e2e/garbage_collector.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - v1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/metrics" diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index 019ff0ef9b5..a9fb852c26d 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/watch" clientv1 "k8s.io/client-go/pkg/api/v1" "k8s.io/api/core/v1" - batchv1 "k8s.io/kubernetes/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/kubernetes/pkg/apis/batch/v2alpha1" + batchv1 "k8s.io/api/batch/v1" + batchv2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/ingress.go b/test/e2e/ingress.go index 2b3914a60b1..40a14e699e9 100644 --- a/test/e2e/ingress.go +++ b/test/e2e/ingress.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/authentication/serviceaccount" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index 7a30230fa1d..dd57edeadce 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -52,7 +52,7 @@ import ( "k8s.io/apiserver/pkg/authentication/serviceaccount" genericregistry "k8s.io/apiserver/pkg/registry/generic/registry" "k8s.io/api/core/v1" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/test/e2e/nvidia-gpus.go b/test/e2e/nvidia-gpus.go index 16c050530ef..3817a1397aa 100644 --- a/test/e2e/nvidia-gpus.go +++ b/test/e2e/nvidia-gpus.go @@ -29,7 +29,7 @@ import ( utilyaml "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/podpreset.go b/test/e2e/podpreset.go index 9f83e75b5e9..7039ae1140b 100644 --- a/test/e2e/podpreset.go +++ b/test/e2e/podpreset.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/watch" "k8s.io/api/core/v1" - settings "k8s.io/kubernetes/pkg/apis/settings/v1alpha1" + settings "k8s.io/api/settings/v1alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/replica_set.go b/test/e2e/replica_set.go index f7c8c6ecae5..54ceda77cb7 100644 --- a/test/e2e/replica_set.go +++ b/test/e2e/replica_set.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/controller/replicaset" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/statefulset.go b/test/e2e/statefulset.go index ced82bd4e61..5df19dfcca0 100644 --- a/test/e2e/statefulset.go +++ b/test/e2e/statefulset.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index 36cf5fc41ba..5cc47411ad8 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -38,10 +38,10 @@ import ( "k8s.io/apiserver/pkg/authentication/serviceaccount" "k8s.io/api/core/v1" v1helper "k8s.io/kubernetes/pkg/api/v1/helper" - rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" + storage "k8s.io/api/storage/v1" storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util" - storagebeta "k8s.io/kubernetes/pkg/apis/storage/v1beta1" + storagebeta "k8s.io/api/storage/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/storage/vsphere_utils.go b/test/e2e/storage/vsphere_utils.go index d8acedcc77f..db6a2c9ecdf 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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_fstype.go b/test/e2e/storage/vsphere_volume_fstype.go index a7d91a56123..72cce90064c 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/storage/vsphere_volume_ops_storm.go b/test/e2e/storage/vsphere_volume_ops_storm.go index c3ab6df2c7f..3b7fc3b5823 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/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" vsphere "k8s.io/kubernetes/pkg/cloudprovider/providers/vsphere" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/third-party.go b/test/e2e/third-party.go index 9f2e6da01af..854872704d1 100644 --- a/test/e2e/third-party.go +++ b/test/e2e/third-party.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/pkg/api" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/upgrades/daemonsets.go b/test/e2e/upgrades/daemonsets.go index 1d3a319afbd..268ac3efffc 100644 --- a/test/e2e/upgrades/daemonsets.go +++ b/test/e2e/upgrades/daemonsets.go @@ -24,7 +24,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/upgrades/deployments.go b/test/e2e/upgrades/deployments.go index 55f3759417f..b5dcc248637 100644 --- a/test/e2e/upgrades/deployments.go +++ b/test/e2e/upgrades/deployments.go @@ -20,7 +20,7 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/upgrades/horizontal_pod_autoscalers.go b/test/e2e/upgrades/horizontal_pod_autoscalers.go index bb5110ebb38..119221d7a84 100644 --- a/test/e2e/upgrades/horizontal_pod_autoscalers.go +++ b/test/e2e/upgrades/horizontal_pod_autoscalers.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - autoscalingv1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + autoscalingv1 "k8s.io/api/autoscaling/v1" "k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/upgrades/job.go b/test/e2e/upgrades/job.go index 7f662e57602..b05b9cbcf8a 100644 --- a/test/e2e/upgrades/job.go +++ b/test/e2e/upgrades/job.go @@ -18,7 +18,7 @@ package upgrades import ( "k8s.io/api/core/v1" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" diff --git a/test/e2e/upgrades/statefulset.go b/test/e2e/upgrades/statefulset.go index fda6d05bff1..f06716bf673 100644 --- a/test/e2e/upgrades/statefulset.go +++ b/test/e2e/upgrades/statefulset.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/api/apps/v1beta1" "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_federation/deployment.go b/test/e2e_federation/deployment.go index 9361ed0b7f8..9c574889d1b 100644 --- a/test/e2e_federation/deployment.go +++ b/test/e2e_federation/deployment.go @@ -26,7 +26,7 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" fedframework "k8s.io/kubernetes/test/e2e_federation/framework" diff --git a/test/e2e_federation/ingress.go b/test/e2e_federation/ingress.go index cf134ef3589..67b758971fa 100644 --- a/test/e2e_federation/ingress.go +++ b/test/e2e_federation/ingress.go @@ -34,7 +34,7 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" kubeclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e_federation/namespace.go b/test/e2e_federation/namespace.go index 2b561be9c54..6f792fd3b22 100644 --- a/test/e2e_federation/namespace.go +++ b/test/e2e_federation/namespace.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/typed/core/v1" k8s_api_v1 "k8s.io/kubernetes/pkg/api/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" fedframework "k8s.io/kubernetes/test/e2e_federation/framework" diff --git a/test/e2e_federation/replicaset.go b/test/e2e_federation/replicaset.go index 4aaff10a406..033db8371b0 100644 --- a/test/e2e_federation/replicaset.go +++ b/test/e2e_federation/replicaset.go @@ -28,7 +28,7 @@ import ( fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" fedutil "k8s.io/kubernetes/federation/pkg/federation-controller/util" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/e2e/framework" fedframework "k8s.io/kubernetes/test/e2e_federation/framework" diff --git a/test/integration/apiserver/apiserver_test.go b/test/integration/apiserver/apiserver_test.go index 33114a9d8fa..d672e6aa346 100644 --- a/test/integration/apiserver/apiserver_test.go +++ b/test/integration/apiserver/apiserver_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/auth/auth_test.go b/test/integration/auth/auth_test.go index 49bd6fff905..24c771c440f 100644 --- a/test/integration/auth/auth_test.go +++ b/test/integration/auth/auth_test.go @@ -47,7 +47,7 @@ import ( "k8s.io/client-go/tools/clientcmd/api/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - authenticationv1beta1 "k8s.io/kubernetes/pkg/apis/authentication/v1beta1" + authenticationv1beta1 "k8s.io/api/authentication/v1beta1" "k8s.io/kubernetes/pkg/apis/autoscaling" "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/auth/authorizer/abac" diff --git a/test/integration/deployment/util.go b/test/integration/deployment/util.go index 7023389cc60..9aa036eb1d3 100644 --- a/test/integration/deployment/util.go +++ b/test/integration/deployment/util.go @@ -26,7 +26,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/deployment" diff --git a/test/integration/evictions/evictions_test.go b/test/integration/evictions/evictions_test.go index 0c141391554..6da157dba77 100644 --- a/test/integration/evictions/evictions_test.go +++ b/test/integration/evictions/evictions_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/policy/v1beta1" + "k8s.io/api/policy/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/disruption" diff --git a/test/integration/federation/api_test.go b/test/integration/federation/api_test.go index c90944aaa8a..6c7c9e42851 100644 --- a/test/integration/federation/api_test.go +++ b/test/integration/federation/api_test.go @@ -29,9 +29,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" "k8s.io/api/core/v1" - autoscaling_v1 "k8s.io/kubernetes/pkg/apis/autoscaling/v1" - batch_v1 "k8s.io/kubernetes/pkg/apis/batch/v1" - ext_v1b1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + autoscaling_v1 "k8s.io/api/autoscaling/v1" + batch_v1 "k8s.io/api/batch/v1" + ext_v1b1 "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/test/integration/federation/framework" ) diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index 0bf0b28b3d6..6cbe960e632 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -54,14 +54,14 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" "k8s.io/api/core/v1" - apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" - autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1" + apps "k8s.io/api/apps/v1beta1" + autoscaling "k8s.io/api/autoscaling/v1" "k8s.io/kubernetes/pkg/apis/batch" - certificates "k8s.io/kubernetes/pkg/apis/certificates/v1beta1" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" + extensions "k8s.io/api/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/v1" + rbac "k8s.io/api/rbac/v1alpha1" + storage "k8s.io/api/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/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index 8409c4d977a..66add9a462f 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -29,7 +29,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/api/core/v1" - "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" "k8s.io/kubernetes/pkg/controller/replicaset" diff --git a/test/integration/storageclasses/storage_classes_test.go b/test/integration/storageclasses/storage_classes_test.go index 6021dd06ce8..7b012634187 100644 --- a/test/integration/storageclasses/storage_classes_test.go +++ b/test/integration/storageclasses/storage_classes_test.go @@ -26,7 +26,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/storage/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/integration/framework" ) diff --git a/test/integration/thirdparty/thirdparty_test.go b/test/integration/thirdparty/thirdparty_test.go index f93f87aa884..39342b4c8d1 100644 --- a/test/integration/thirdparty/thirdparty_test.go +++ b/test/integration/thirdparty/thirdparty_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/api" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "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 a5d61cae4bb..a8ee01c77ce 100644 --- a/test/integration/volume/persistent_volumes_test.go +++ b/test/integration/volume/persistent_volumes_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/api/v1/ref" - storage "k8s.io/kubernetes/pkg/apis/storage/v1" + storage "k8s.io/api/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" diff --git a/test/utils/deployment.go b/test/utils/deployment.go index 67d05cee029..8f4b43299a3 100644 --- a/test/utils/deployment.go +++ b/test/utils/deployment.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/api/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util" labelsutil "k8s.io/kubernetes/pkg/util/labels" diff --git a/test/utils/runners.go b/test/utils/runners.go index 2a0cf25b2f9..4811f0256e5 100644 --- a/test/utils/runners.go +++ b/test/utils/runners.go @@ -38,9 +38,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" batchinternal "k8s.io/kubernetes/pkg/apis/batch" - batch "k8s.io/kubernetes/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" extensionsinternal "k8s.io/kubernetes/pkg/apis/extensions" - extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"