run ./root-rewrite-all-other-apis.sh, then run make all, pkg/... compiles

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"
 )

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 = `

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"

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()

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()

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 {

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

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.

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 {

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

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.

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.

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.

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 {

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 {

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

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

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 {

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

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

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.

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.

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"
 )
 

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"
 )
 

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"

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"

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"
 )
 

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"
 )

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"
 

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"
 

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"
 

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"
 )

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"
 

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"
 )
 

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"

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"
 )

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"

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"
 

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"

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"
 )
 

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()

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()

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"
 )
 

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"
 )
 

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

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

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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

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

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

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"
 )
 

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"
 )
 

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) {

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 {

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"
 )
 

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) {

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 {

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"
 )
 

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) {

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) {

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) {

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 {

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 {

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.

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"
 )
 

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) {

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) {

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) {

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 {

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 {

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.

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"
 )
 

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

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"
 )
 

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"
 )
 

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

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"
 )
 

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"
 )
 

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

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"
 )
 

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"
 )
 

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"
 )
 

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

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"
 )
 

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"
 )
 

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 {

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

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) {

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 {

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"
 )
 

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"
 )
 

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 {

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"
 )
 

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

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

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 {

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