diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index e2defbcb917..d0a3433c5c7 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apiserver/pkg/server/healthz" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" diff --git a/cmd/gke-certificates-controller/app/gke_certificates_controller.go b/cmd/gke-certificates-controller/app/gke_certificates_controller.go index b0e64df1f0e..9928a66e06c 100644 --- a/cmd/gke-certificates-controller/app/gke_certificates_controller.go +++ b/cmd/gke-certificates-controller/app/gke_certificates_controller.go @@ -22,7 +22,7 @@ import ( "time" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index f30df0fa2e1..9a3020090c0 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -40,7 +40,7 @@ import ( "k8s.io/client-go/discovery" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 2237156b193..fba5b4703b0 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -42,7 +42,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" clientgoclientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/record" diff --git a/cmd/kubeadm/app/cmd/token.go b/cmd/kubeadm/app/cmd/token.go index ff6fdb5b028..1d96d2d15bf 100644 --- a/cmd/kubeadm/app/cmd/token.go +++ b/cmd/kubeadm/app/cmd/token.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" tokenphase "k8s.io/kubernetes/cmd/kubeadm/app/phases/token" diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 80a2f06f529..d5ead117733 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -20,7 +20,7 @@ import ( "path/filepath" "time" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/util/version" ) diff --git a/cmd/kubeadm/app/discovery/file/file.go b/cmd/kubeadm/app/discovery/file/file.go index f68e7259a6a..c683676e713 100644 --- a/cmd/kubeadm/app/discovery/file/file.go +++ b/cmd/kubeadm/app/discovery/file/file.go @@ -22,7 +22,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/discovery/token/token.go b/cmd/kubeadm/app/discovery/token/token.go index c0d139a2288..d30f73b4bb9 100644 --- a/cmd/kubeadm/app/discovery/token/token.go +++ b/cmd/kubeadm/app/discovery/token/token.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 55fe560c461..4db061d0522 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/sets" - api "k8s.io/client-go/pkg/api/v1" + api "k8s.io/api/core/v1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapiext "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1alpha1" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/master/manifests_test.go b/cmd/kubeadm/app/master/manifests_test.go index a7c0120fcf3..0cdf9ca8f06 100644 --- a/cmd/kubeadm/app/master/manifests_test.go +++ b/cmd/kubeadm/app/master/manifests_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/yaml" - api "k8s.io/client-go/pkg/api/v1" + api "k8s.io/api/core/v1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" diff --git a/cmd/kubeadm/app/master/selfhosted.go b/cmd/kubeadm/app/master/selfhosted.go index 8331ee36765..744147276eb 100644 --- a/cmd/kubeadm/app/master/selfhosted.go +++ b/cmd/kubeadm/app/master/selfhosted.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" - ext "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + ext "k8s.io/api/extensions/v1beta1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/images" diff --git a/cmd/kubeadm/app/node/validate.go b/cmd/kubeadm/app/node/validate.go index 320c29c33a9..af50ca9a004 100644 --- a/cmd/kubeadm/app/node/validate.go +++ b/cmd/kubeadm/app/node/validate.go @@ -20,7 +20,7 @@ import ( "fmt" clientset "k8s.io/client-go/kubernetes" - certsapi "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certsapi "k8s.io/api/certificates/v1beta1" ) // ValidateAPIServer makes sure the server we're connecting to supports the Beta Certificates API diff --git a/cmd/kubeadm/app/phases/addons/addons.go b/cmd/kubeadm/app/phases/addons/addons.go index 3c3ab5f113c..a9da571bf7b 100644 --- a/cmd/kubeadm/app/phases/addons/addons.go +++ b/cmd/kubeadm/app/phases/addons/addons.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" kuberuntime "k8s.io/apimachinery/pkg/runtime" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" "k8s.io/kubernetes/cmd/kubeadm/app/images" diff --git a/cmd/kubeadm/app/phases/apiconfig/clusterroles.go b/cmd/kubeadm/app/phases/apiconfig/clusterroles.go index c6f4f1b6f96..ae8700069c7 100644 --- a/cmd/kubeadm/app/phases/apiconfig/clusterroles.go +++ b/cmd/kubeadm/app/phases/apiconfig/clusterroles.go @@ -22,8 +22,9 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" - rbac "k8s.io/client-go/pkg/apis/rbac/v1beta1" + "k8s.io/api/core/v1" + rbac "k8s.io/api/rbac/v1beta1" +rbachelper "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" @@ -105,7 +106,7 @@ func createRoles(clientset *clientset.Clientset) error { Namespace: metav1.NamespacePublic, }, Rules: []rbac.PolicyRule{ - rbac.NewRule("get").Groups("").Resources("configmaps").RuleOrDie(), + rbachelper.NewRule("get").Groups("").Resources("configmaps").RuleOrDie(), }, }, } @@ -165,7 +166,7 @@ func createClusterRoles(clientset *clientset.Clientset) error { Name: nodeAutoApproveBootstrap, }, Rules: []rbac.PolicyRule{ - rbac.NewRule("create").Groups("certificates.k8s.io").Resources("certificatesigningrequests/nodeclient").RuleOrDie(), + rbachelper.NewRule("create").Groups("certificates.k8s.io").Resources("certificatesigningrequests/nodeclient").RuleOrDie(), }, }, } diff --git a/cmd/kubeadm/app/phases/apiconfig/setupmaster.go b/cmd/kubeadm/app/phases/apiconfig/setupmaster.go index 0b0bd0b94ea..1e95e6bc041 100644 --- a/cmd/kubeadm/app/phases/apiconfig/setupmaster.go +++ b/cmd/kubeadm/app/phases/apiconfig/setupmaster.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" "k8s.io/kubernetes/pkg/util/node" diff --git a/cmd/kubeadm/app/phases/apiconfig/setupmaster_test.go b/cmd/kubeadm/app/phases/apiconfig/setupmaster_test.go index 5e25a716986..4c07b8f5e29 100644 --- a/cmd/kubeadm/app/phases/apiconfig/setupmaster_test.go +++ b/cmd/kubeadm/app/phases/apiconfig/setupmaster_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" corev1 "k8s.io/client-go/kubernetes/typed/core/v1" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" diff --git a/cmd/kubeadm/app/phases/token/bootstrap.go b/cmd/kubeadm/app/phases/token/bootstrap.go index 9b60913017f..71ff5707ef7 100644 --- a/cmd/kubeadm/app/phases/token/bootstrap.go +++ b/cmd/kubeadm/app/phases/token/bootstrap.go @@ -23,7 +23,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" tokenutil "k8s.io/kubernetes/cmd/kubeadm/app/util/token" diff --git a/cmd/kubeadm/app/phases/validate/validate.go b/cmd/kubeadm/app/phases/validate/validate.go index 6629c498e00..4e54cf961d3 100644 --- a/cmd/kubeadm/app/phases/validate/validate.go +++ b/cmd/kubeadm/app/phases/validate/validate.go @@ -25,8 +25,8 @@ import ( kuberuntime "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" - nodeutil "k8s.io/client-go/pkg/api/v1/node" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + nodeutil "k8s.io/kubernetes/pkg/api/v1/node" + extensions "k8s.io/api/extensions/v1beta1" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm" kubeadmconstants "k8s.io/kubernetes/cmd/kubeadm/app/constants" kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util" diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 47ce3f5b5e7..8608389594a 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -49,7 +49,7 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" clientgoclientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" clientauth "k8s.io/client-go/tools/auth" "k8s.io/client-go/tools/clientcmd" diff --git a/cmd/kubemark/hollow-node.go b/cmd/kubemark/hollow-node.go index 18509469a5e..f7edb4a4736 100644 --- a/cmd/kubemark/hollow-node.go +++ b/cmd/kubemark/hollow-node.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/util/flag" clientgoclientset "k8s.io/client-go/kubernetes" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/record" diff --git a/federation/pkg/federation-controller/deployment/deploymentcontroller.go b/federation/pkg/federation-controller/deployment/deploymentcontroller.go index bc62f4a19d0..4dc378dbe54 100644 --- a/federation/pkg/federation-controller/deployment/deploymentcontroller.go +++ b/federation/pkg/federation-controller/deployment/deploymentcontroller.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/federation/pkg/federation-controller/ingress/ingress_controller.go b/federation/pkg/federation-controller/ingress/ingress_controller.go index cfd68682a0b..e2cdb75f9a2 100644 --- a/federation/pkg/federation-controller/ingress/ingress_controller.go +++ b/federation/pkg/federation-controller/ingress/ingress_controller.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/federation/pkg/federation-controller/namespace/namespace_controller.go b/federation/pkg/federation-controller/namespace/namespace_controller.go index 6bf29f53f18..7e743c29655 100644 --- a/federation/pkg/federation-controller/namespace/namespace_controller.go +++ b/federation/pkg/federation-controller/namespace/namespace_controller.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go index 762f57bbc6d..96d726cc427 100644 --- a/federation/pkg/federation-controller/replicaset/replicasetcontroller.go +++ b/federation/pkg/federation-controller/replicaset/replicasetcontroller.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/federation/pkg/federation-controller/service/servicecontroller.go b/federation/pkg/federation-controller/service/servicecontroller.go index a1b28d9532f..ce4a88c71ba 100644 --- a/federation/pkg/federation-controller/service/servicecontroller.go +++ b/federation/pkg/federation-controller/service/servicecontroller.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/federation/pkg/federation-controller/sync/controller.go b/federation/pkg/federation-controller/sync/controller.go index 69f62fc619e..5c072a8782e 100644 --- a/federation/pkg/federation-controller/sync/controller.go +++ b/federation/pkg/federation-controller/sync/controller.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink.go b/federation/pkg/federation-controller/util/eventsink/eventsink.go index c3b0af8ff3e..d516610de91 100644 --- a/federation/pkg/federation-controller/util/eventsink/eventsink.go +++ b/federation/pkg/federation-controller/util/eventsink/eventsink.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" fedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset" kubev1 "k8s.io/api/core/v1" diff --git a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go index d1a93976ca5..8745cad0d32 100644 --- a/federation/pkg/federation-controller/util/eventsink/eventsink_test.go +++ b/federation/pkg/federation-controller/util/eventsink/eventsink_test.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" core "k8s.io/client-go/testing" fakefedclientset "k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset/fake" . "k8s.io/kubernetes/federation/pkg/federation-controller/util/test" diff --git a/pkg/bootstrap/api/types.go b/pkg/bootstrap/api/types.go index 547ca6a675e..a7cca0c9bd8 100644 --- a/pkg/bootstrap/api/types.go +++ b/pkg/bootstrap/api/types.go @@ -17,7 +17,7 @@ limitations under the License. package api import ( - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) const ( diff --git a/pkg/controller/bootstrap/bootstrapsigner.go b/pkg/controller/bootstrap/bootstrapsigner.go index be01c0f354d..7cfe3079231 100644 --- a/pkg/controller/bootstrap/bootstrapsigner.go +++ b/pkg/controller/bootstrap/bootstrapsigner.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/controller/bootstrap/bootstrapsigner_test.go b/pkg/controller/bootstrap/bootstrapsigner_test.go index 0cc6809c942..8525d2637e8 100644 --- a/pkg/controller/bootstrap/bootstrapsigner_test.go +++ b/pkg/controller/bootstrap/bootstrapsigner_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" diff --git a/pkg/controller/bootstrap/common_test.go b/pkg/controller/bootstrap/common_test.go index 5c7b356779b..edc6f28150b 100644 --- a/pkg/controller/bootstrap/common_test.go +++ b/pkg/controller/bootstrap/common_test.go @@ -22,7 +22,7 @@ import ( "github.com/davecgh/go-spew/spew" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api/helper" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" diff --git a/pkg/controller/bootstrap/tokencleaner.go b/pkg/controller/bootstrap/tokencleaner.go index 555ade1ccb5..4c4e614d98d 100644 --- a/pkg/controller/bootstrap/tokencleaner.go +++ b/pkg/controller/bootstrap/tokencleaner.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" clientset "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/kubernetes/pkg/api" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" diff --git a/pkg/controller/bootstrap/util.go b/pkg/controller/bootstrap/util.go index 8b0c22a9d1e..b0f1aecc7f8 100644 --- a/pkg/controller/bootstrap/util.go +++ b/pkg/controller/bootstrap/util.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" ) diff --git a/pkg/controller/bootstrap/util_test.go b/pkg/controller/bootstrap/util_test.go index 37c0ab03b19..8527d8a834a 100644 --- a/pkg/controller/bootstrap/util_test.go +++ b/pkg/controller/bootstrap/util_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" bootstrapapi "k8s.io/kubernetes/pkg/bootstrap/api" ) diff --git a/pkg/controller/cloud/nodecontroller.go b/pkg/controller/cloud/nodecontroller.go index 129d875b9c7..2dd81fdb20d 100644 --- a/pkg/controller/cloud/nodecontroller.go +++ b/pkg/controller/cloud/nodecontroller.go @@ -27,7 +27,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/controller/cloud/nodecontroller_test.go b/pkg/controller/cloud/nodecontroller_test.go index 1f909095e3a..c062fa0e4a2 100644 --- a/pkg/controller/cloud/nodecontroller_test.go +++ b/pkg/controller/cloud/nodecontroller_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/externalversions" diff --git a/pkg/controller/controller_ref_manager_test.go b/pkg/controller/controller_ref_manager_test.go index 62e68363935..493c833577f 100644 --- a/pkg/controller/controller_ref_manager_test.go +++ b/pkg/controller/controller_ref_manager_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" "k8s.io/api/core/v1" ) diff --git a/pkg/controller/cronjob/cronjob_controller.go b/pkg/controller/cronjob/cronjob_controller.go index c0de344d1b3..ffed8783bb5 100644 --- a/pkg/controller/cronjob/cronjob_controller.go +++ b/pkg/controller/cronjob/cronjob_controller.go @@ -43,7 +43,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/controller/daemon/daemoncontroller.go b/pkg/controller/daemon/daemoncontroller.go index ba2de80ec5a..5d4f3ed419f 100644 --- a/pkg/controller/daemon/daemoncontroller.go +++ b/pkg/controller/daemon/daemoncontroller.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index 145b9f94d08..6d50a093c9a 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/pkg/controller/deployment/deployment_controller.go @@ -34,7 +34,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 2be0fd83922..95894cd4365 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -28,7 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/job/jobcontroller.go b/pkg/controller/job/jobcontroller.go index 94d8543e374..0b1b2f135c1 100644 --- a/pkg/controller/job/jobcontroller.go +++ b/pkg/controller/job/jobcontroller.go @@ -29,7 +29,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/node/cloud_cidr_allocator.go b/pkg/controller/node/cloud_cidr_allocator.go index 71167bb9846..207efeea56c 100644 --- a/pkg/controller/node/cloud_cidr_allocator.go +++ b/pkg/controller/node/cloud_cidr_allocator.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/controller/node/controller_utils.go b/pkg/controller/node/controller_utils.go index a66944d6376..b1ad1e49252 100644 --- a/pkg/controller/node/controller_utils.go +++ b/pkg/controller/node/controller_utils.go @@ -27,7 +27,7 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index 201e6e01bbc..162891ddbf1 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/controller/node/range_allocator.go b/pkg/controller/node/range_allocator.go index 3e903ce5843..aa645d70e09 100644 --- a/pkg/controller/node/range_allocator.go +++ b/pkg/controller/node/range_allocator.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/controller/node/taint_controller.go b/pkg/controller/node/taint_controller.go index 15351e05a2a..c0f666669e6 100644 --- a/pkg/controller/node/taint_controller.go +++ b/pkg/controller/node/taint_controller.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/types" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/node/testutil/test_utils.go b/pkg/controller/node/testutil/test_utils.go index 20d7ac5014e..00912a6818b 100644 --- a/pkg/controller/node/testutil/test_utils.go +++ b/pkg/controller/node/testutil/test_utils.go @@ -33,8 +33,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/util/clock" - clientv1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/api/v1/ref" + clientv1 "k8s.io/api/core/v1" + "k8s.io/kubernetes/pkg/api/v1/ref" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index 2e1060a02b5..fe77267d35b 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/pkg/controller/podautoscaler/horizontal.go @@ -32,7 +32,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index ff436b77200..3e7c6aad317 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/pkg/controller/podautoscaler/horizontal_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/watch" clientfake "k8s.io/client-go/kubernetes/fake" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/legacy_horizontal_test.go b/pkg/controller/podautoscaler/legacy_horizontal_test.go index 9128cecabdd..ec49c6ea049 100644 --- a/pkg/controller/podautoscaler/legacy_horizontal_test.go +++ b/pkg/controller/podautoscaler/legacy_horizontal_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" clientfake "k8s.io/client-go/kubernetes/fake" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/legacy_replica_calculator_test.go b/pkg/controller/podautoscaler/legacy_replica_calculator_test.go index 5a176208331..42e703c2683 100644 --- a/pkg/controller/podautoscaler/legacy_replica_calculator_test.go +++ b/pkg/controller/podautoscaler/legacy_replica_calculator_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go index 5babd61d9a0..d9e0d286962 100644 --- a/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/legacy_metrics_client.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - clientgov1 "k8s.io/client-go/pkg/api/v1" + clientgov1 "k8s.io/api/core/v1" "k8s.io/api/core/v1" autoscaling "k8s.io/api/autoscaling/v2alpha1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" diff --git a/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go index 8a543306fdb..329a215e4eb 100644 --- a/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/legacy_metrics_client_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go index 259e2d88a09..a66095ea941 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/api/core/v1" autoscaling "k8s.io/api/autoscaling/v2alpha1" customapi "k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1" diff --git a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go index aaab9c7217c..270f2a62422 100644 --- a/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go +++ b/pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" kv1 "k8s.io/api/core/v1" diff --git a/pkg/controller/podautoscaler/replica_calculator_test.go b/pkg/controller/podautoscaler/replica_calculator_test.go index c609393e601..9a6eb47a86f 100644 --- a/pkg/controller/podautoscaler/replica_calculator_test.go +++ b/pkg/controller/podautoscaler/replica_calculator_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" core "k8s.io/client-go/testing" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index 592f9b7f38e..733fd8cbce2 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -32,7 +32,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/replication/replication_controller.go b/pkg/controller/replication/replication_controller.go index d316f0c4d5c..878522852e3 100644 --- a/pkg/controller/replication/replication_controller.go +++ b/pkg/controller/replication/replication_controller.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utiltrace "k8s.io/apiserver/pkg/util/trace" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/service/servicecontroller.go b/pkg/controller/service/servicecontroller.go index ebb48d8c1b9..caf8b8c410b 100644 --- a/pkg/controller/service/servicecontroller.go +++ b/pkg/controller/service/servicecontroller.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/statefulset/stateful_set.go b/pkg/controller/statefulset/stateful_set.go index 737b8880d66..c5cde36b1bd 100644 --- a/pkg/controller/statefulset/stateful_set.go +++ b/pkg/controller/statefulset/stateful_set.go @@ -27,7 +27,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/controller/volume/attachdetach/attach_detach_controller.go b/pkg/controller/volume/attachdetach/attach_detach_controller.go index 97ab1046da3..00556bc69bc 100644 --- a/pkg/controller/volume/attachdetach/attach_detach_controller.go +++ b/pkg/controller/volume/attachdetach/attach_detach_controller.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/runtime" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" kcache "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/controller/volume/persistentvolume/pv_controller_base.go b/pkg/controller/volume/persistentvolume/pv_controller_base.go index dd849a09a42..2d1e6363e2c 100644 --- a/pkg/controller/volume/persistentvolume/pv_controller_base.go +++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go @@ -28,7 +28,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" diff --git a/pkg/kubectl/cmd/top_pod_test.go b/pkg/kubectl/cmd/top_pod_test.go index 56d3e09e67c..edd4ff00986 100644 --- a/pkg/kubectl/cmd/top_pod_test.go +++ b/pkg/kubectl/cmd/top_pod_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest/fake" "k8s.io/kubernetes/pkg/api" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" diff --git a/pkg/kubectl/cmd/top_test.go b/pkg/kubectl/cmd/top_test.go index 68d5f63979d..ea6700300dd 100644 --- a/pkg/kubectl/cmd/top_test.go +++ b/pkg/kubectl/cmd/top_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/api" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1" diff --git a/pkg/kubelet/cm/node_container_manager.go b/pkg/kubelet/cm/node_container_manager.go index 6fc2dc62f3c..a4f3bae82c4 100644 --- a/pkg/kubelet/cm/node_container_manager.go +++ b/pkg/kubelet/cm/node_container_manager.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/types" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" "k8s.io/kubernetes/pkg/kubelet/events" diff --git a/pkg/kubelet/config/config_test.go b/pkg/kubelet/config/config_test.go index eea2b06590b..26325e26342 100644 --- a/pkg/kubelet/config/config_test.go +++ b/pkg/kubelet/config/config_test.go @@ -27,7 +27,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/kubelet/container/helpers.go b/pkg/kubelet/container/helpers.go index 64339791fc2..cf63a4e7089 100644 --- a/pkg/kubelet/container/helpers.go +++ b/pkg/kubelet/container/helpers.go @@ -29,7 +29,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" diff --git a/pkg/kubelet/events/event.go b/pkg/kubelet/events/event.go index 1319cf9fc65..9a68763b13d 100644 --- a/pkg/kubelet/events/event.go +++ b/pkg/kubelet/events/event.go @@ -17,7 +17,7 @@ limitations under the License. package events import ( - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/api/core/v1" ) diff --git a/pkg/kubelet/eviction/eviction_manager.go b/pkg/kubelet/eviction/eviction_manager.go index daee6792be6..597e56108e1 100644 --- a/pkg/kubelet/eviction/eviction_manager.go +++ b/pkg/kubelet/eviction/eviction_manager.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" v1qos "k8s.io/kubernetes/pkg/api/v1/helper/qos" diff --git a/pkg/kubelet/eviction/eviction_manager_test.go b/pkg/kubelet/eviction/eviction_manager_test.go index 8c9fbf2e28b..26ce3c1f8f0 100644 --- a/pkg/kubelet/eviction/eviction_manager_test.go +++ b/pkg/kubelet/eviction/eviction_manager_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/clock" utilfeature "k8s.io/apiserver/pkg/util/feature" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" kubeapi "k8s.io/kubernetes/pkg/api" "k8s.io/api/core/v1" diff --git a/pkg/kubelet/images/image_gc_manager.go b/pkg/kubelet/images/image_gc_manager.go index a87128f5d4a..8e9e847ca8c 100644 --- a/pkg/kubelet/images/image_gc_manager.go +++ b/pkg/kubelet/images/image_gc_manager.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/cadvisor" diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 192ddac6110..7583943e068 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -48,7 +48,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 87cf34739ea..76fab2aa59e 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -36,7 +36,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/flowcontrol" "k8s.io/api/core/v1" diff --git a/pkg/kubelet/oom_watcher.go b/pkg/kubelet/oom_watcher.go index 58831e19df4..2a7c96331d4 100644 --- a/pkg/kubelet/oom_watcher.go +++ b/pkg/kubelet/oom_watcher.go @@ -22,7 +22,7 @@ import ( cadvisorapi "github.com/google/cadvisor/info/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/kubelet/cadvisor" ) diff --git a/pkg/kubelet/oom_watcher_test.go b/pkg/kubelet/oom_watcher_test.go index daaeb11a435..6fd0287e571 100644 --- a/pkg/kubelet/oom_watcher_test.go +++ b/pkg/kubelet/oom_watcher_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" cadvisortest "k8s.io/kubernetes/pkg/kubelet/cadvisor/testing" ) diff --git a/pkg/kubelet/runonce_test.go b/pkg/kubelet/runonce_test.go index 70e0b5f4c2f..c2760ce03f5 100644 --- a/pkg/kubelet/runonce_test.go +++ b/pkg/kubelet/runonce_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/clock" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" utiltesting "k8s.io/client-go/util/testing" "k8s.io/api/core/v1" diff --git a/pkg/kubelet/util/csr/csr.go b/pkg/kubelet/util/csr/csr.go index e51a8a806e8..155b73cc709 100644 --- a/pkg/kubelet/util/csr/csr.go +++ b/pkg/kubelet/util/csr/csr.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" - certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" certutil "k8s.io/client-go/util/cert" ) diff --git a/pkg/kubelet/util/csr/csr_test.go b/pkg/kubelet/util/csr/csr_test.go index 1036f4c2c88..64b1396d3d5 100644 --- a/pkg/kubelet/util/csr/csr_test.go +++ b/pkg/kubelet/util/csr/csr_test.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" watch "k8s.io/apimachinery/pkg/watch" certificatesclient "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" - certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" certutil "k8s.io/client-go/util/cert" ) diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/kubemark/hollow_proxy.go index 01535092f46..b76ce21e5a4 100644 --- a/pkg/kubemark/hollow_proxy.go +++ b/pkg/kubemark/hollow_proxy.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" proxyapp "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/pkg/api" diff --git a/pkg/proxy/healthcheck/healthcheck.go b/pkg/proxy/healthcheck/healthcheck.go index 39f10f71a26..067b04a7862 100644 --- a/pkg/proxy/healthcheck/healthcheck.go +++ b/pkg/proxy/healthcheck/healthcheck.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/clock" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" ) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 3e6329ffc45..5f77bf45e2c 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -39,7 +39,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" utilfeature "k8s.io/apiserver/pkg/util/feature" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/helper" diff --git a/plugin/cmd/kube-scheduler/app/configurator.go b/plugin/cmd/kube-scheduler/app/configurator.go index a40dbbb7976..7b0871cb30c 100644 --- a/plugin/cmd/kube-scheduler/app/configurator.go +++ b/plugin/cmd/kube-scheduler/app/configurator.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/kubernetes/plugin/pkg/scheduler" _ "k8s.io/kubernetes/plugin/pkg/scheduler/algorithmprovider" diff --git a/plugin/pkg/scheduler/scheduler_test.go b/plugin/pkg/scheduler/scheduler_test.go index 5a71d55c9fd..75ff5a31d71 100644 --- a/plugin/pkg/scheduler/scheduler_test.go +++ b/plugin/pkg/scheduler/scheduler_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/wait" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" clientcache "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/client/cr.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/client/cr.go index f98644fac3d..784b6feffbc 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/client/cr.go +++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/client/cr.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/wait" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" // Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters). // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/controller/controller.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/controller/controller.go index 58adf3ea55a..19fe5a09679 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/controller/controller.go +++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/controller/controller.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/main.go b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/main.go index 5fe598829bd..c689002845f 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/main.go +++ b/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/main.go @@ -25,7 +25,7 @@ import ( apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/staging/src/k8s.io/apiextensions-apiserver/test/integration/client-go_test.go b/staging/src/k8s.io/apiextensions-apiserver/test/integration/client-go_test.go index d6b98fb7c5c..dde146c8b40 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/test/integration/client-go_test.go +++ b/staging/src/k8s.io/apiextensions-apiserver/test/integration/client-go_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apiextensions-apiserver/test/integration/testserver" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" examplecrv1 "k8s.io/apiextensions-apiserver/examples/client-go/apis/cr/v1" exampleclient "k8s.io/apiextensions-apiserver/examples/client-go/client" diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go index e01445621e2..fe2ebfd5862 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" corelisters "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) const ( diff --git a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission_test.go b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission_test.go index 7b2e2b06413..814b0a0e3c9 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle/admission_test.go @@ -32,7 +32,7 @@ import ( informers "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/generated.pb.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/generated.pb.go index 7b60d8e0b0e..d72ec502f65 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/generated.pb.go @@ -42,7 +42,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" import k8s_io_apimachinery_pkg_runtime "k8s.io/apimachinery/pkg/runtime" -import k8s_io_client_go_pkg_apis_authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" +import k8s_io_client_go_pkg_apis_authentication_v1 "k8s.io/api/authentication/v1" import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types" diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.generated.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.generated.go index 8491d108f26..7673ab89a5e 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg4_runtime "k8s.io/apimachinery/pkg/runtime" pkg2_types "k8s.io/apimachinery/pkg/types" - pkg3_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + pkg3_v1 "k8s.io/api/authentication/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.go index 3d9049a1e52..0552191f147 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - authnv1 "k8s.io/client-go/pkg/apis/authentication/v1" + authnv1 "k8s.io/api/authentication/v1" ) // Header keys used by the audit system. diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go index ed4ed2fc243..3835763d8e2 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.conversion.go @@ -26,7 +26,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" types "k8s.io/apimachinery/pkg/types" audit "k8s.io/apiserver/pkg/apis/audit" - authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + authentication_v1 "k8s.io/api/authentication/v1" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go index 42533cbd6cc..ee833af9665 100644 --- a/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authentication_v1 "k8s.io/client-go/pkg/apis/authentication/v1" + authentication_v1 "k8s.io/api/authentication/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/apiserver/pkg/audit/request.go b/staging/src/k8s.io/apiserver/pkg/audit/request.go index e9a2c19fd71..e1575fb5ed8 100644 --- a/staging/src/k8s.io/apiserver/pkg/audit/request.go +++ b/staging/src/k8s.io/apiserver/pkg/audit/request.go @@ -36,7 +36,7 @@ import ( "k8s.io/apiserver/pkg/apis/audit" auditinternal "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authorization/authorizer" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationv1 "k8s.io/api/authentication/v1" ) func NewEventFromRequest(req *http.Request, level auditinternal.Level, attribs authorizer.Attributes) (*auditinternal.Event, error) { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go index a27577540f3..656d9bc5dd5 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/authorization_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" - batch "k8s.io/client-go/pkg/apis/batch/v1" + batch "k8s.io/api/batch/v1" ) func TestGetAuthorizerAttributes(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go index 16a00c4342a..6bbe3354639 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation.go @@ -30,8 +30,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/apiserver/pkg/server/httplog" - "k8s.io/client-go/pkg/api/v1" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" + "k8s.io/api/core/v1" + authenticationv1 "k8s.io/api/authentication/v1" ) // WithImpersonation is a filter that will inspect and check requests that attempt to change the user.Info for their requests diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go index cf5ed9b73da..1ce3ca45c9f 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/impersonation_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/request" - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" ) type impersonateAuthorizer struct{} diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/legacy_audit.go b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/legacy_audit.go index 692895eae5b..9168f642a83 100644 --- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/legacy_audit.go +++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/legacy_audit.go @@ -32,7 +32,7 @@ import ( utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/request" - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" ) var _ http.ResponseWriter = &legacyAuditResponseWriter{} diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go index 73460536efb..9f415584047 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/rest/response_checker_test.go @@ -26,7 +26,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func TestGenericHttpResponseChecker(t *testing.T) { diff --git a/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go b/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go index b8973d0b685..80260522c1d 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/cacher_whitebox_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // verifies the cacheWatcher.process goroutine is properly cleaned up even if diff --git a/staging/src/k8s.io/apiserver/pkg/storage/watch_cache_test.go b/staging/src/k8s.io/apiserver/pkg/storage/watch_cache_test.go index 9f8a360e00e..84e704730a9 100644 --- a/staging/src/k8s.io/apiserver/pkg/storage/watch_cache_test.go +++ b/staging/src/k8s.io/apiserver/pkg/storage/watch_cache_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go index db631dfde3b..c639b28c636 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go +++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" listersv1 "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/intstr" ) diff --git a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy_test.go b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy_test.go index f21cfeed114..5636d5efb78 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy_test.go +++ b/staging/src/k8s.io/apiserver/pkg/util/proxy/proxy_test.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go index 3da6506738e..498eac550e8 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/kubernetes/scheme" authenticationclient "k8s.io/client-go/kubernetes/typed/authentication/v1beta1" - authentication "k8s.io/client-go/pkg/apis/authentication/v1beta1" + authentication "k8s.io/api/authentication/v1beta1" ) var ( diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook_test.go b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook_test.go index 0e48e5598c0..adffe434876 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook_test.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook/webhook_test.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apiserver/pkg/authentication/user" - "k8s.io/client-go/pkg/apis/authentication/v1beta1" + "k8s.io/api/authentication/v1beta1" "k8s.io/client-go/tools/clientcmd/api/v1" ) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go index 91f233b1400..e48f8f7233c 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/kubernetes/scheme" authorizationclient "k8s.io/client-go/kubernetes/typed/authorization/v1beta1" - authorization "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorization "k8s.io/api/authorization/v1beta1" ) var ( diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook_test.go b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook_test.go index 85bca35cec9..4c66b0130fb 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook_test.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook/webhook_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - "k8s.io/client-go/pkg/apis/authorization/v1beta1" + "k8s.io/api/authorization/v1beta1" "k8s.io/client-go/tools/clientcmd/api/v1" ) diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client.go b/staging/src/k8s.io/client-go/discovery/discovery_client.go index 0ee46b863b4..69880146124 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client.go +++ b/staging/src/k8s.io/client-go/discovery/discovery_client.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go index f4058991c34..94b1b438ce9 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go +++ b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/version" . "k8s.io/client-go/discovery" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/discovery/fake/discovery.go b/staging/src/k8s.io/client-go/discovery/fake/discovery.go index eb2be254068..3b3dc640833 100644 --- a/staging/src/k8s.io/client-go/discovery/fake/discovery.go +++ b/staging/src/k8s.io/client-go/discovery/fake/discovery.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/version" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" kubeversion "k8s.io/client-go/pkg/version" restclient "k8s.io/client-go/rest" "k8s.io/client-go/testing" diff --git a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go index 7b7236bc44a..24a0008155a 100644 --- a/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go +++ b/staging/src/k8s.io/client-go/discovery/helper_blackbox_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" ) diff --git a/staging/src/k8s.io/client-go/dynamic/client.go b/staging/src/k8s.io/client-go/dynamic/client.go index a0c1820944a..7389df87c5d 100644 --- a/staging/src/k8s.io/client-go/dynamic/client.go +++ b/staging/src/k8s.io/client-go/dynamic/client.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" ) diff --git a/staging/src/k8s.io/client-go/examples/create-update-delete-deployment/main.go b/staging/src/k8s.io/client-go/examples/create-update-delete-deployment/main.go index 2913510f2e3..db9450af4fb 100644 --- a/staging/src/k8s.io/client-go/examples/create-update-delete-deployment/main.go +++ b/staging/src/k8s.io/client-go/examples/create-update-delete-deployment/main.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - apiv1 "k8s.io/client-go/pkg/api/v1" - appsv1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + apiv1 "k8s.io/api/core/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/client-go/tools/clientcmd" // Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters). // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/client/tpr.go b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/client/tpr.go index 9f69e1f3d23..d426ecbce51 100644 --- a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/client/tpr.go +++ b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/client/tpr.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/util/wait" tprv1 "k8s.io/client-go/examples/third-party-resources-deprecated/apis/tpr/v1" "k8s.io/client-go/kubernetes" - apiv1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + apiv1 "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/rest" // Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters). // _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" diff --git a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/controller/controller.go b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/controller/controller.go index 15355296a09..d01a5617427 100644 --- a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/controller/controller.go +++ b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/controller/controller.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" diff --git a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/main.go b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/main.go index 877706830d5..d6964e776b8 100644 --- a/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/main.go +++ b/staging/src/k8s.io/client-go/examples/third-party-resources-deprecated/main.go @@ -25,7 +25,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" diff --git a/staging/src/k8s.io/client-go/examples/workqueue/main.go b/staging/src/k8s.io/client-go/examples/workqueue/main.go index c255ed764f6..d92454976ea 100644 --- a/staging/src/k8s.io/client-go/examples/workqueue/main.go +++ b/staging/src/k8s.io/client-go/examples/workqueue/main.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/workqueue" diff --git a/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 868c16f2a62..26d3a12cf6c 100644 --- a/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/admissionregistration/v1alpha1" - admissionregistration_v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/initializerconfiguration.go b/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/initializerconfiguration.go index 78d49f473c0..6a3bd547be6 100644 --- a/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/staging/src/k8s.io/client-go/informers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/admissionregistration/v1alpha1" - admissionregistration_v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/apps/v1beta1/controllerrevision.go b/staging/src/k8s.io/client-go/informers/apps/v1beta1/controllerrevision.go index ef4dfce6baa..ac57753cf10 100644 --- a/staging/src/k8s.io/client-go/informers/apps/v1beta1/controllerrevision.go +++ b/staging/src/k8s.io/client-go/informers/apps/v1beta1/controllerrevision.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/apps/v1beta1" - apps_v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go b/staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go index 41ed724f378..7e067c8aa99 100644 --- a/staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/informers/apps/v1beta1/deployment.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/apps/v1beta1" - apps_v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go b/staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go index 4ee88dd611c..641f88d56db 100644 --- a/staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go +++ b/staging/src/k8s.io/client-go/informers/apps/v1beta1/statefulset.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/apps/v1beta1" - apps_v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + apps_v1beta1 "k8s.io/api/apps/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go index 7469a6b109c..e89778c3f2a 100644 --- a/staging/src/k8s.io/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/informers/autoscaling/v1/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/autoscaling/v1" - autoscaling_v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" + autoscaling_v1 "k8s.io/api/autoscaling/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 81cd5eeb193..cac23b2a4e5 100644 --- a/staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v2alpha1 "k8s.io/client-go/listers/autoscaling/v2alpha1" - autoscaling_v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + autoscaling_v2alpha1 "k8s.io/api/autoscaling/v2alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/batch/v1/job.go b/staging/src/k8s.io/client-go/informers/batch/v1/job.go index c0e48c353c0..268045ed70a 100644 --- a/staging/src/k8s.io/client-go/informers/batch/v1/job.go +++ b/staging/src/k8s.io/client-go/informers/batch/v1/job.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/batch/v1" - batch_v1 "k8s.io/client-go/pkg/apis/batch/v1" + batch_v1 "k8s.io/api/batch/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/batch/v2alpha1/cronjob.go b/staging/src/k8s.io/client-go/informers/batch/v2alpha1/cronjob.go index db36dbdc092..5bd4b3a186a 100644 --- a/staging/src/k8s.io/client-go/informers/batch/v2alpha1/cronjob.go +++ b/staging/src/k8s.io/client-go/informers/batch/v2alpha1/cronjob.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v2alpha1 "k8s.io/client-go/listers/batch/v2alpha1" - batch_v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" + batch_v2alpha1 "k8s.io/api/batch/v2alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/certificates/v1beta1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/informers/certificates/v1beta1/certificatesigningrequest.go index d4a139b6350..b28aac7a98b 100644 --- a/staging/src/k8s.io/client-go/informers/certificates/v1beta1/certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/informers/certificates/v1beta1/certificatesigningrequest.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/certificates/v1beta1" - certificates_v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certificates_v1beta1 "k8s.io/api/certificates/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go b/staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go index 62a67d0d8c9..b7918650bed 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/componentstatus.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/configmap.go b/staging/src/k8s.io/client-go/informers/core/v1/configmap.go index 2dc10f3a9c4..93a1747c780 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/configmap.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/configmap.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/endpoints.go b/staging/src/k8s.io/client-go/informers/core/v1/endpoints.go index b0ea2bcb608..e3a5d7b0f41 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/endpoints.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/endpoints.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/event.go b/staging/src/k8s.io/client-go/informers/core/v1/event.go index bc314c425fa..9d3800e38af 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/event.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/event.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/limitrange.go b/staging/src/k8s.io/client-go/informers/core/v1/limitrange.go index 65edd82080d..31ccf04e9ad 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/limitrange.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/limitrange.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/namespace.go b/staging/src/k8s.io/client-go/informers/core/v1/namespace.go index 281fd416cd1..a10ced1ea89 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/namespace.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/namespace.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/node.go b/staging/src/k8s.io/client-go/informers/core/v1/node.go index f66010edadf..673f98cdbe2 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/node.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/node.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/persistentvolume.go b/staging/src/k8s.io/client-go/informers/core/v1/persistentvolume.go index 3a552583fcf..77b20811037 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/persistentvolume.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/persistentvolume.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/persistentvolumeclaim.go b/staging/src/k8s.io/client-go/informers/core/v1/persistentvolumeclaim.go index 5a79590da95..42723522016 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/persistentvolumeclaim.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/persistentvolumeclaim.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/pod.go b/staging/src/k8s.io/client-go/informers/core/v1/pod.go index 8c58aee6d00..9ea1a3ca16b 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/pod.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/pod.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/podtemplate.go b/staging/src/k8s.io/client-go/informers/core/v1/podtemplate.go index 429906425bd..32ba9ce74cd 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/podtemplate.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/podtemplate.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/replicationcontroller.go b/staging/src/k8s.io/client-go/informers/core/v1/replicationcontroller.go index e39b46de701..f9da21d37ac 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/replicationcontroller.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/replicationcontroller.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/resourcequota.go b/staging/src/k8s.io/client-go/informers/core/v1/resourcequota.go index afa1f65226e..38d6a74fa8a 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/resourcequota.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/resourcequota.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/secret.go b/staging/src/k8s.io/client-go/informers/core/v1/secret.go index 7b8f58c9f1c..d2c743f4604 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/secret.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/secret.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/service.go b/staging/src/k8s.io/client-go/informers/core/v1/service.go index b20a43b4708..614b811440c 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/service.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/service.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/core/v1/serviceaccount.go b/staging/src/k8s.io/client-go/informers/core/v1/serviceaccount.go index 911078ea2c9..1542dd0cf13 100644 --- a/staging/src/k8s.io/client-go/informers/core/v1/serviceaccount.go +++ b/staging/src/k8s.io/client-go/informers/core/v1/serviceaccount.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/core/v1" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/daemonset.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/daemonset.go index 77f870e0fad..a19de7737c5 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/daemonset.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/daemonset.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/deployment.go index f74b35e02db..3f69845b6c4 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/deployment.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/ingress.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/ingress.go index e07f6fb2dbb..ad59ed8957c 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/ingress.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/ingress.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/podsecuritypolicy.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/podsecuritypolicy.go index 12fec02db51..9319b794ca7 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/podsecuritypolicy.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/podsecuritypolicy.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/replicaset.go index 8fa8a4291ba..e5726547392 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/replicaset.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/replicaset.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/thirdpartyresource.go b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/thirdpartyresource.go index 8a580406042..615f01a78eb 100644 --- a/staging/src/k8s.io/client-go/informers/extensions/v1beta1/thirdpartyresource.go +++ b/staging/src/k8s.io/client-go/informers/extensions/v1beta1/thirdpartyresource.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/extensions/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + extensions_v1beta1 "k8s.io/api/extensions/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/generic.go b/staging/src/k8s.io/client-go/informers/generic.go index 19b66a52bd7..4d4ecc87cfa 100644 --- a/staging/src/k8s.io/client-go/informers/generic.go +++ b/staging/src/k8s.io/client-go/informers/generic.go @@ -21,22 +21,22 @@ package informers import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" - api_v1 "k8s.io/client-go/pkg/api/v1" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" - v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" - v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" - batch_v1 "k8s.io/client-go/pkg/apis/batch/v1" - batch_v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" - certificates_v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" - extensions_v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" - networking_v1 "k8s.io/client-go/pkg/apis/networking/v1" - policy_v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" - rbac_v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" - rbac_v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" - settings_v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" - storage_v1 "k8s.io/client-go/pkg/apis/storage/v1" - storage_v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + api_v1 "k8s.io/api/core/v1" + 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" cache "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/informers/networking/v1/networkpolicy.go b/staging/src/k8s.io/client-go/informers/networking/v1/networkpolicy.go index 46475df8b43..2b2efc9475f 100644 --- a/staging/src/k8s.io/client-go/informers/networking/v1/networkpolicy.go +++ b/staging/src/k8s.io/client-go/informers/networking/v1/networkpolicy.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/networking/v1" - networking_v1 "k8s.io/client-go/pkg/apis/networking/v1" + networking_v1 "k8s.io/api/networking/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/policy/v1beta1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/informers/policy/v1beta1/poddisruptionbudget.go index a8258eaf837..d872dc80ccd 100644 --- a/staging/src/k8s.io/client-go/informers/policy/v1beta1/poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/informers/policy/v1beta1/poddisruptionbudget.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/policy/v1beta1" - policy_v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + policy_v1beta1 "k8s.io/api/policy/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrole.go b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrole.go index c378311be74..2bd4614e8c0 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrole.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrole.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1" - rbac_v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrolebinding.go b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrolebinding.go index bf101187ab7..7a7a9d61f81 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/clusterrolebinding.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1" - rbac_v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/role.go b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/role.go index efaf45a73f9..6b61fd579eb 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/role.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/role.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1" - rbac_v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/rolebinding.go b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/rolebinding.go index c7b515b61a0..6faf708af3a 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/rolebinding.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1alpha1/rolebinding.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1" - rbac_v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrole.go b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrole.go index 852804b5c86..ba3c04eb5ae 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrole.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrole.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/rbac/v1beta1" - rbac_v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrolebinding.go b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrolebinding.go index 1597da39041..8d92e398128 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/clusterrolebinding.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/rbac/v1beta1" - rbac_v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/role.go b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/role.go index 27a595ab9ae..e3ba9dbada0 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/role.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/role.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/rbac/v1beta1" - rbac_v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/rolebinding.go b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/rolebinding.go index 508f7ec85f1..b8869444b03 100644 --- a/staging/src/k8s.io/client-go/informers/rbac/v1beta1/rolebinding.go +++ b/staging/src/k8s.io/client-go/informers/rbac/v1beta1/rolebinding.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/rbac/v1beta1" - rbac_v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + rbac_v1beta1 "k8s.io/api/rbac/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/settings/v1alpha1/podpreset.go b/staging/src/k8s.io/client-go/informers/settings/v1alpha1/podpreset.go index 6f89088fffd..a1ad408e67a 100644 --- a/staging/src/k8s.io/client-go/informers/settings/v1alpha1/podpreset.go +++ b/staging/src/k8s.io/client-go/informers/settings/v1alpha1/podpreset.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1alpha1 "k8s.io/client-go/listers/settings/v1alpha1" - settings_v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" + settings_v1alpha1 "k8s.io/api/settings/v1alpha1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/storage/v1/storageclass.go b/staging/src/k8s.io/client-go/informers/storage/v1/storageclass.go index 13030532de3..035a4528088 100644 --- a/staging/src/k8s.io/client-go/informers/storage/v1/storageclass.go +++ b/staging/src/k8s.io/client-go/informers/storage/v1/storageclass.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1 "k8s.io/client-go/listers/storage/v1" - storage_v1 "k8s.io/client-go/pkg/apis/storage/v1" + storage_v1 "k8s.io/api/storage/v1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/informers/storage/v1beta1/storageclass.go b/staging/src/k8s.io/client-go/informers/storage/v1beta1/storageclass.go index e34548e0d3d..032bda3bd31 100644 --- a/staging/src/k8s.io/client-go/informers/storage/v1beta1/storageclass.go +++ b/staging/src/k8s.io/client-go/informers/storage/v1beta1/storageclass.go @@ -25,7 +25,7 @@ import ( internalinterfaces "k8s.io/client-go/informers/internalinterfaces" kubernetes "k8s.io/client-go/kubernetes" v1beta1 "k8s.io/client-go/listers/storage/v1beta1" - storage_v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + storage_v1beta1 "k8s.io/api/storage/v1beta1" cache "k8s.io/client-go/tools/cache" time "time" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/fake/register.go b/staging/src/k8s.io/client-go/kubernetes/fake/register.go index 2b3e1667e6c..214700ea881 100644 --- a/staging/src/k8s.io/client-go/kubernetes/fake/register.go +++ b/staging/src/k8s.io/client-go/kubernetes/fake/register.go @@ -21,26 +21,26 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - corev1 "k8s.io/client-go/pkg/api/v1" - admissionregistrationv1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" - appsv1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/client-go/pkg/apis/authentication/v1beta1" - authorizationv1 "k8s.io/client-go/pkg/apis/authorization/v1" - authorizationv1beta1 "k8s.io/client-go/pkg/apis/authorization/v1beta1" - autoscalingv1 "k8s.io/client-go/pkg/apis/autoscaling/v1" - autoscalingv2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" - batchv1 "k8s.io/client-go/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" - certificatesv1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" - extensionsv1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" - networkingv1 "k8s.io/client-go/pkg/apis/networking/v1" - policyv1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" - rbacv1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" - rbacv1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" - settingsv1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" - storagev1 "k8s.io/client-go/pkg/apis/storage/v1" - storagev1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + corev1 "k8s.io/api/core/v1" + 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/staging/src/k8s.io/client-go/kubernetes/scheme/register.go b/staging/src/k8s.io/client-go/kubernetes/scheme/register.go index c4af63a465f..9865ad5d7fc 100644 --- a/staging/src/k8s.io/client-go/kubernetes/scheme/register.go +++ b/staging/src/k8s.io/client-go/kubernetes/scheme/register.go @@ -21,26 +21,26 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - corev1 "k8s.io/client-go/pkg/api/v1" - admissionregistrationv1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" - appsv1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" - authenticationv1 "k8s.io/client-go/pkg/apis/authentication/v1" - authenticationv1beta1 "k8s.io/client-go/pkg/apis/authentication/v1beta1" - authorizationv1 "k8s.io/client-go/pkg/apis/authorization/v1" - authorizationv1beta1 "k8s.io/client-go/pkg/apis/authorization/v1beta1" - autoscalingv1 "k8s.io/client-go/pkg/apis/autoscaling/v1" - autoscalingv2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" - batchv1 "k8s.io/client-go/pkg/apis/batch/v1" - batchv2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" - certificatesv1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" - extensionsv1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" - networkingv1 "k8s.io/client-go/pkg/apis/networking/v1" - policyv1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" - rbacv1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" - rbacv1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" - settingsv1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" - storagev1 "k8s.io/client-go/pkg/apis/storage/v1" - storagev1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + corev1 "k8s.io/api/core/v1" + 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/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go index 1ac48c8f32b..730577c2d3d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 08d68dd0d5c..952522176c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go index 0f5d2293c20..38933c81394 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go index d57f9044f43..6f91c13a576 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go index 25fee850229..450ad4e70e6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/apps_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/apps_client.go index c18da39f6d2..b854f36dad5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/apps_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/apps_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go index de24bbb5824..8948891f793 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/controllerrevision.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go index b30965ee780..6d4cb0812f1 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go index cdf9a27c52b..f37bf98ffc2 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go index 1323ed59e12..c8f557be125 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go index c85e470ea35..fc6f5c0803c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go index 8b5a7822fc4..2f704613606 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1/statefulset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/authentication_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/authentication_client.go index bd53fc2498c..51bbfe323ed 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/authentication_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/authentication_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/authentication/v1" + v1 "k8s.io/api/authentication/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go index 7bd52459809..7008c927cd4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview_expansion.go index fb41782fe52..ea21f1b4a2b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1/tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1" + authenticationapi "k8s.io/api/authentication/v1" ) type TokenReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go index 419dc2cb677..f4590553c4f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/authentication_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/authentication/v1beta1" + v1beta1 "k8s.io/api/authentication/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go index e27e0929074..92ef5d1a158 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1beta1" + authenticationapi "k8s.io/api/authentication/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go index 375b6f637c7..8f186fa76ae 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authenticationapi "k8s.io/client-go/pkg/apis/authentication/v1beta1" + authenticationapi "k8s.io/api/authentication/v1beta1" ) type TokenReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/authorization_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/authorization_client.go index af2924a300a..d093f5d90b8 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/authorization_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/authorization_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/authorization/v1" + v1 "k8s.io/api/authorization/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go index e587d203288..a01e415c8fa 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go index e0bbcb1efcf..91acbe029e7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go index 823d1542c31..7ddc58ff4ae 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go index c3b487c72c1..0c123b07ce5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) type LocalSubjectAccessReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go index 10761508016..5b70a27dd62 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) type SelfSubjectAccessReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go index dfdf6521ae8..b5ed87d3015 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1" + authorizationapi "k8s.io/api/authorization/v1" ) // The SubjectAccessReviewExpansion interface allows manually adding extra methods to the AuthorizationInterface. diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go index b49b3b30b61..7bd0dc58543 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/authorization_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/authorization/v1beta1" + v1beta1 "k8s.io/api/authorization/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go index 0db666db02a..5211628f26e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go index d1f7756380c..6e3af12a789 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go index 58ced8eca69..b0b18b099c0 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go index d2ce4f0d7fe..bf1b8a5f108 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) type LocalSubjectAccessReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go index d341eb14a50..58fecfd85bf 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) type SelfSubjectAccessReviewExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go index 8d03b0811a7..4f93689e8ac 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - authorizationapi "k8s.io/client-go/pkg/apis/authorization/v1beta1" + authorizationapi "k8s.io/api/authorization/v1beta1" ) // The SubjectAccessReviewExpansion interface allows manually adding extra methods to the AuthorizationInterface. diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go index b235891c91f..f1da5ec4ab7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/autoscaling_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 210b06b82d4..7f252d1452a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go index f9c790af228..c2d890a0558 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go index 0d16aa3e97f..c6debcb979b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go @@ -19,7 +19,7 @@ package v2alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go index 1f0389df3b7..1b87fc79e3d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go index c85bfd9f3c8..30cacbf1454 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/batch_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/batch_client.go index c8766f5b600..980dfce7022 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/batch_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/batch_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/fake_job.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/fake_job.go index e1305931991..f79b4ae4d67 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/fake_job.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake/fake_job.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go index c8120f6d85a..38392db1d8d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/job.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/batch_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/batch_client.go index e2b2dd5cd0d..a6f25c60f82 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/batch_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/batch_client.go @@ -19,7 +19,7 @@ package v2alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/cronjob.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/cronjob.go index 2447f2add0a..228c3814414 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/cronjob.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/cronjob.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go index 17f50d6358a..f1094d299a5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go index c9c39acb20d..4d74446b1ea 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificates_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go index 7407ef0688f..1af1e1f30e0 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go index 4765bba8ab5..c63b80638f6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" ) type CertificateSigningRequestExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go index 9c7c3435c7f..22c6d2d601c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go index 2333c0f3ec0..8af33e62ad5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - certificates "k8s.io/client-go/pkg/apis/certificates/v1beta1" + certificates "k8s.io/api/certificates/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go index 50671976aad..302bf157fb1 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/componentstatus.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go index bb21636e2dd..7dfb01d7321 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/configmap.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/core_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/core_client.go index 0972960d109..d386688e4c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/core_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/core_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go index 3580742a86f..5a305d246db 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/endpoints.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go index c4ac11006cd..414055a5112 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event_expansion.go index 0ad170b3d7e..ea1ed35256c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/event_expansion.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/pkg/api/v1/ref" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_componentstatus.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_componentstatus.go index a1e670de9e3..04fd1a5f34d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_componentstatus.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_componentstatus.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_configmap.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_configmap.go index 801c44128fb..b7a295df04c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_configmap.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_configmap.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_endpoints.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_endpoints.go index f87d2a6e73a..61a26ee8330 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_endpoints.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_endpoints.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event.go index dba60cd2a58..27106b9addc 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go index c52919746d7..e7eb940aaf7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_event_expansion.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_limitrange.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_limitrange.go index 91de207413e..6ab75a8a954 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_limitrange.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_limitrange.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace.go index 23f62cb54c3..c8492b9092e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go index 1ac7e75d765..a0eae349044 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node.go index f4477648984..815d866d5e7 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go index 597334582c9..eb684fd2951 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_node_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolume.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolume.go index c4af9f0953f..90f6a05ad05 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolume.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolume.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go index cb6280877d3..6917f3ad6cd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod.go index 864e8137df7..ef7f697a418 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go index c9d404e1623..497cc785705 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_pod_expansion.go @@ -17,8 +17,8 @@ limitations under the License. package fake import ( - "k8s.io/client-go/pkg/api/v1" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + "k8s.io/api/core/v1" + policy "k8s.io/api/policy/v1beta1" restclient "k8s.io/client-go/rest" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_podtemplate.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_podtemplate.go index e6ac59c4547..934f329710d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_podtemplate.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_podtemplate.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go index 005a28bb33c..b4f8e3323bf 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_resourcequota.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_resourcequota.go index 00d633020c2..5c247e68341 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_resourcequota.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_resourcequota.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_secret.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_secret.go index 375ed033008..c16438ebcd2 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_secret.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_secret.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service.go index a755ffdf9fd..b1f8dac414e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_service.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_serviceaccount.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_serviceaccount.go index a3837cbb586..43a52286f17 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_serviceaccount.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/fake/fake_serviceaccount.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go index 998f03452c1..c417b081eb3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/limitrange.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go index 3092bd8e182..a9c0ef7b391 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace_expansion.go index 20343000073..17effe29c65 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/namespace_expansion.go @@ -16,7 +16,7 @@ limitations under the License. package v1 -import "k8s.io/client-go/pkg/api/v1" +import "k8s.io/api/core/v1" // The NamespaceExpansion interface allows manually adding extra methods to the NamespaceInterface. type NamespaceExpansion interface { diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go index 6b82d4fabd1..9765bc77c7e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node_expansion.go index 29c12aabcdb..cbaedab9e63 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/node_expansion.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/types" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // The NodeExpansion interface allows manually adding extra methods to the NodeInterface. diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go index 16a4b7316f5..ffb6e8c1eb6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolume.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go index ae7cc4a4f42..ea4436be0dc 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/persistentvolumeclaim.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go index 5648750eaab..4526abfeca3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go index 3919289e553..edfb84d18e2 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/pod_expansion.go @@ -18,8 +18,8 @@ package v1 import ( "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + "k8s.io/api/core/v1" + policy "k8s.io/api/policy/v1beta1" restclient "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go index 19c82f17b34..769c8b11b29 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/podtemplate.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go index 2f4f4fa9e1c..8f0979d13f8 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/replicationcontroller.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go index 565fe1e6d62..54b3b1d7fcd 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/resourcequota.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go index fbcede81856..ba0621742c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/secret.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go index 0eccf79a805..cb10c7704d8 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/service.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go index f71789f6ab5..8b7cd6c5365 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/core/v1/serviceaccount.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go index 8c132db9ba8..e817eb0c8bb 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/daemonset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go index 7d0122c2aef..b35ee22a6e5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment_expansion.go index e737f09ae1c..24734be6a6e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/deployment_expansion.go @@ -16,7 +16,7 @@ limitations under the License. package v1beta1 -import "k8s.io/client-go/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/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go index 5284346e19d..691ffd2068e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/extensions_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go index c5d14fe4c6d..84e968fbee5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go index 8be25eeea9b..c0afeb9febe 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index f49c3366640..af2bc0f713a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package fake import ( - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go index d947a3764b2..c18c02a7866 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go index f8b704d2fa4..710a839500f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go index 3becce4c38a..a739edc2f29 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go index db13b4c37ba..d17675f0669 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go @@ -18,7 +18,7 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index 60093cc77a1..44085fb0c9b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go index 86bf65b8f57..caac300af88 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/ingress.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go index ad57a6cabf0..121718c6afc 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go index aa6f505a2bf..e7be2b9b757 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/replicaset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/scale_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/scale_expansion.go index 85d7c40a8b1..d23395a04d6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/scale_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/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/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions/v1beta1" ) // The ScaleExpansion interface allows manually adding extra methods to the ScaleInterface. diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go index 617c2069be7..5303948b884 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go index a15f8673e79..8279ccf1c1a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networking_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networking_client.go index 20429dd5d78..b6fa937b3c9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networking_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networking_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go index 14d1e669b10..30c1dc06d63 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/networking/v1/networkpolicy.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction_expansion.go index bde1baca6ef..40bad265f07 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/eviction_expansion.go @@ -17,7 +17,7 @@ limitations under the License. package v1beta1 import ( - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" ) // The EvictionExpansion interface allows manually adding extra methods to the ScaleInterface. diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go index 35c40713c06..ba857d5e0ec 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go @@ -18,7 +18,7 @@ package fake import ( "k8s.io/apimachinery/pkg/runtime/schema" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" core "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go index 0b14cd88cb1..461574559df 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go index 8088dd0196f..ba8edc18843 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/policy_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/policy_client.go index 9d62aad04e8..f5e7238039a 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/policy_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/policy/v1beta1/policy_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go index 241061025a5..64457e9cab9 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrole.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go index bc48873a59f..54c7fae5f0f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go index 47b704b4e9a..4263c304373 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go index c17a1865264..61786f1e819 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go index c70b213a332..eae1ebb9a3d 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go index f4768985eac..6551f1f1d86 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go index 67256d50f55..f4155ce8fb6 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rbac_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go index 9c4fa915eb2..14f8d152429 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/role.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go index 5e81967f174..9a7c24d4d6b 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/rolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go index 6a63571f399..85826360b49 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrole.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go index a2f3875096c..0ce465289a5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go index 43fbd921f68..23b71e3a757 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go index e223cc2fb99..9f3c65ca5d5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go index 334a7045191..bbd3612047c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_role.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go index 5a4729b912d..ad79389a1e4 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go index a24ef4f9ab0..66189af09ab 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rbac_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go index aa57ac31966..fa3bbd6be8c 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/role.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go index 3dee9107e1d..0643dafb4f5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/rbac/v1beta1/rolebinding.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go index 8c576cab922..75473d9ad04 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go index b8fc0a022af..fd5e6100954 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/podpreset.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/settings_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/settings_client.go index 1a90034bcdd..ec1e30d7a21 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/settings_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/settings/v1alpha1/settings_client.go @@ -19,7 +19,7 @@ package v1alpha1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/fake_storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/fake_storageclass.go index 51ae990c0e4..e3f3c1894c3 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/fake_storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/fake/fake_storageclass.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1 "k8s.io/client-go/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storage_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storage_client.go index a95d30b2d75..2a3b942021e 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storage_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storage_client.go @@ -19,7 +19,7 @@ package v1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go index 0283c997091..f758148ab70 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1/storageclass.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1 "k8s.io/client-go/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go index 895abe56f84..882e822a95f 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go @@ -22,7 +22,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" - v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" testing "k8s.io/client-go/testing" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storage_client.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storage_client.go index 7abb99e5737..05d42903bf5 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storage_client.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storage_client.go @@ -19,7 +19,7 @@ package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go index 6980fc78bf4..e6634114a07 100644 --- a/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go +++ b/staging/src/k8s.io/client-go/kubernetes/typed/storage/v1beta1/storageclass.go @@ -21,7 +21,7 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" scheme "k8s.io/client-go/kubernetes/scheme" - v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" rest "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index c84b35e5daf..f800b943b8d 100644 --- a/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/initializerconfiguration.go b/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/initializerconfiguration.go index bfe5d467537..e32e7d7ce5c 100644 --- a/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1/initializerconfiguration.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1" + v1alpha1 "k8s.io/api/admissionregistration/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/controllerrevision.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/controllerrevision.go index f94ed93ebde..2690e4272e8 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/controllerrevision.go +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/controllerrevision.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go index 210f76170c5..5e51aa94e89 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/deployment.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go index 293a3f6637b..c8387581382 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/scale.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go index e987dbb12de..6aec508beef 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + v1beta1 "k8s.io/api/apps/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset_expansion.go b/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset_expansion.go index b71c13cf8d7..2bb5499b721 100644 --- a/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset_expansion.go +++ b/staging/src/k8s.io/client-go/listers/apps/v1beta1/statefulset_expansion.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" - apps "k8s.io/client-go/pkg/apis/apps/v1beta1" + "k8s.io/api/core/v1" + apps "k8s.io/api/apps/v1beta1" ) // StatefulSetListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go index ff340fe29c1..ef79b7a29c5 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/listers/autoscaling/v1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/apis/autoscaling/v1" + v1 "k8s.io/api/autoscaling/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 77c5203ec4e..44f92d78588 100644 --- a/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go @@ -21,7 +21,7 @@ package v2alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v2alpha1 "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + v2alpha1 "k8s.io/api/autoscaling/v2alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/batch/v1/job.go b/staging/src/k8s.io/client-go/listers/batch/v1/job.go index 442c3a9edab..7f1fc34e614 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v1/job.go +++ b/staging/src/k8s.io/client-go/listers/batch/v1/job.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/apis/batch/v1" + v1 "k8s.io/api/batch/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/batch/v1/job_expansion.go b/staging/src/k8s.io/client-go/listers/batch/v1/job_expansion.go index 8c285e8daf5..7359ecb9253 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v1/job_expansion.go +++ b/staging/src/k8s.io/client-go/listers/batch/v1/job_expansion.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" - batch "k8s.io/client-go/pkg/apis/batch/v1" + "k8s.io/api/core/v1" + batch "k8s.io/api/batch/v1" ) // JobListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go b/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go index d45b6139e06..9a1fbd09961 100644 --- a/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go +++ b/staging/src/k8s.io/client-go/listers/batch/v2alpha1/cronjob.go @@ -21,7 +21,7 @@ package v2alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v2alpha1 "k8s.io/client-go/pkg/apis/batch/v2alpha1" + v2alpha1 "k8s.io/api/batch/v2alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go b/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go index d4d39939da1..e37176864c2 100644 --- a/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/staging/src/k8s.io/client-go/listers/certificates/v1beta1/certificatesigningrequest.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/certificates/v1beta1" + v1beta1 "k8s.io/api/certificates/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go b/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go index 1069130c050..2bfc7f96af4 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/componentstatus.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/configmap.go b/staging/src/k8s.io/client-go/listers/core/v1/configmap.go index ff36729ea0f..dac8f9c8df9 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/configmap.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/configmap.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go b/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go index 483de04b20d..fb231add4a8 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/endpoints.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/event.go b/staging/src/k8s.io/client-go/listers/core/v1/event.go index 952fb93a05d..364119b207e 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/event.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/event.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go b/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go index 05d2c756ed7..cb904142c39 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/limitrange.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/namespace.go b/staging/src/k8s.io/client-go/listers/core/v1/namespace.go index c5328cf163e..6aba49202f0 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/namespace.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/namespace.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/node.go b/staging/src/k8s.io/client-go/listers/core/v1/node.go index 7bbc4e58e2b..a6c0e522e91 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/node.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/node.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/node_expansion.go b/staging/src/k8s.io/client-go/listers/core/v1/node_expansion.go index 8d446b0dca2..0b415adb489 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/node_expansion.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/node_expansion.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // NodeConditionPredicate is a function that indicates whether the given node's conditions meet diff --git a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go index e60b1bc2634..0bd56577417 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolume.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go index b4a7742972a..066e217d6c6 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/persistentvolumeclaim.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/pod.go b/staging/src/k8s.io/client-go/listers/core/v1/pod.go index 83fe353584c..c7069f5cd31 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/pod.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/pod.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go b/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go index c5a595f35cb..215ddb6043f 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/podtemplate.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go b/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go index b25b1dc9b15..c9d6062083d 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller_expansion.go b/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller_expansion.go index 33f653b8aa3..4cc457420ce 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller_expansion.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/replicationcontroller_expansion.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // ReplicationControllerListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go b/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go index f09a5b8cb7d..ec77340e37e 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/resourcequota.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/secret.go b/staging/src/k8s.io/client-go/listers/core/v1/secret.go index 598f700cce8..cc4325d5673 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/secret.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/secret.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/service.go b/staging/src/k8s.io/client-go/listers/core/v1/service.go index e4048faa8f4..b4e291eb7e1 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/service.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/service.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/core/v1/service_expansion.go b/staging/src/k8s.io/client-go/listers/core/v1/service_expansion.go index 86b7e0c08f0..5c8c4749dba 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/service_expansion.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/service_expansion.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // ServiceListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go b/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go index 0250051b0a3..08ac26844a8 100644 --- a/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go +++ b/staging/src/k8s.io/client-go/listers/core/v1/serviceaccount.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go index aa763d45900..1a84b4667c5 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go index d2788907bac..51b91af2780 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/daemonset_expansion.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" - apps "k8s.io/client-go/pkg/apis/apps/v1beta1" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + apps "k8s.io/api/apps/v1beta1" + "k8s.io/api/extensions/v1beta1" ) // DaemonSetListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go index 4c9a31f867f..afaa3f14d51 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment_expansion.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment_expansion.go index 039c714bb15..f3a76f96540 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/deployment_expansion.go +++ b/staging/src/k8s.io/client-go/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/client-go/pkg/apis/extensions/v1beta1" + extensions "k8s.io/api/extensions/v1beta1" ) // DeploymentListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go index 9232635e931..862fd96dc20 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/ingress.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go index ed136426472..fa90ef64221 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go index f07c5e65917..19f71df87a8 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset_expansion.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset_expansion.go index c2e5704148d..01c25557223 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset_expansion.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/replicaset_expansion.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" ) // ReplicaSetListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go index bfcb23829e7..08916c6fb92 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/scale.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go index e1b91fc07a5..d9abd124f70 100644 --- a/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go +++ b/staging/src/k8s.io/client-go/listers/extensions/v1beta1/thirdpartyresource.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + v1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/networking/v1/networkpolicy.go b/staging/src/k8s.io/client-go/listers/networking/v1/networkpolicy.go index 315b34f2fce..4c1f348561e 100644 --- a/staging/src/k8s.io/client-go/listers/networking/v1/networkpolicy.go +++ b/staging/src/k8s.io/client-go/listers/networking/v1/networkpolicy.go @@ -21,7 +21,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/apis/networking/v1" + v1 "k8s.io/api/networking/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go b/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go index dc9ea3c7f90..0d7f49d1a75 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go +++ b/staging/src/k8s.io/client-go/listers/policy/v1beta1/eviction.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go b/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go index f3a5677d5cb..374b981df75 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go +++ b/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/policy/v1beta1" + v1beta1 "k8s.io/api/policy/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go b/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go index 47f3884831c..01f8377441a 100644 --- a/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go +++ b/staging/src/k8s.io/client-go/listers/policy/v1beta1/poddisruptionbudget_expansion.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/pkg/api/v1" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + "k8s.io/api/core/v1" + policy "k8s.io/api/policy/v1beta1" ) // PodDisruptionBudgetListerExpansion allows custom methods to be added to diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go index 98c7b9bd57f..20009978a8b 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrole.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go index 3016525c03d..d52eb1a46d4 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/clusterrolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go index 18478e2ab1c..499f615f271 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/role.go @@ -21,7 +21,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go index b9b395dfa84..1c8e7a15835 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1alpha1/rolebinding.go @@ -21,7 +21,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/rbac/v1alpha1" + v1alpha1 "k8s.io/api/rbac/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go index f963c7406f3..5f45e278ba2 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrole.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go index 2826023c578..7b3df99ae68 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/clusterrolebinding.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go index b1f37a75ebf..c06219c0357 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/role.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go index 9f75e097431..5d7a8b7375f 100644 --- a/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go +++ b/staging/src/k8s.io/client-go/listers/rbac/v1beta1/rolebinding.go @@ -21,7 +21,7 @@ package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/rbac/v1beta1" + v1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go b/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go index 68c894136c0..07d6a06129e 100644 --- a/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go +++ b/staging/src/k8s.io/client-go/listers/settings/v1alpha1/podpreset.go @@ -21,7 +21,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" - v1alpha1 "k8s.io/client-go/pkg/apis/settings/v1alpha1" + v1alpha1 "k8s.io/api/settings/v1alpha1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go b/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go index 29dc6f5f776..a8c167b84da 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go +++ b/staging/src/k8s.io/client-go/listers/storage/v1/storageclass.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1 "k8s.io/client-go/pkg/apis/storage/v1" + v1 "k8s.io/api/storage/v1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go b/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go index 9d876c4ab5c..69900b86193 100644 --- a/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go +++ b/staging/src/k8s.io/client-go/listers/storage/v1beta1/storageclass.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - v1beta1 "k8s.io/client-go/pkg/apis/storage/v1beta1" + v1beta1 "k8s.io/api/storage/v1beta1" "k8s.io/client-go/tools/cache" ) diff --git a/staging/src/k8s.io/client-go/pkg/api/install/install.go b/staging/src/k8s.io/client-go/pkg/api/install/install.go index 1b9553b706f..8be66e572f1 100644 --- a/staging/src/k8s.io/client-go/pkg/api/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/api/install/install.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func init() { diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/conversion.go b/staging/src/k8s.io/client-go/pkg/api/v1/conversion.go index 4ded76091e3..7a64ea3988a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/conversion.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/api/extensions" ) // This is a "fast-path" that avoids reflection for common types. It focuses on the objects that are diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/node/util.go b/staging/src/k8s.io/client-go/pkg/api/v1/node/util.go index 7fd9d25d6bb..c82ac87e51f 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/node/util.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/node/util.go @@ -19,7 +19,7 @@ limitations under the License. package node import ( - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // GetNodeCondition extracts the provided condition from the given status and returns that. diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/ref/ref.go b/staging/src/k8s.io/client-go/pkg/api/v1/ref/ref.go index 51f69555d75..ebcb983992a 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/ref/ref.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/ref/ref.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) var ( diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers.go b/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers.go index 41e02189b2c..83cc4b2d771 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers.go @@ -22,7 +22,7 @@ import ( "strconv" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // PodRequestsAndLimits returns a dictionary of all defined resources summed up for all diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers_test.go b/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers_test.go index 4866bf3c589..a11f88fd8c1 100644 --- a/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers_test.go +++ b/staging/src/k8s.io/client-go/pkg/api/v1/resource/helpers_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func TestResourceHelpers(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/generated.pb.go index 58abc1d2f3e..6fe9ea1e5d7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/generated.pb.go @@ -2165,7 +2165,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/admissionregistration/v1alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go index 34c645df47c..349e6a9c075 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - admissionregistration "k8s.io/client-go/pkg/apis/admissionregistration" + admissionregistration "k8s.io/api/admissionregistration" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/apps/install/install.go index ca50f3ea44f..e73521aabcf 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/install/install.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/apps" - "k8s.io/client-go/pkg/apis/apps/v1beta1" + "k8s.io/api/apps" + "k8s.io/api/apps/v1beta1" ) func init() { @@ -37,7 +37,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: apps.GroupName, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/apps", + ImportPrefix: "k8s.io/api/apps", AddInternalObjectsToScheme: apps.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/register.go b/staging/src/k8s.io/client-go/pkg/apis/apps/register.go index 1098ce0a3e6..a92ad94a72c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/register.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/register.go @@ -19,7 +19,7 @@ package apps import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/api/extensions" ) var ( diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go index 66badd15fb0..d4e434baa16 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/conversion.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/apps" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/api/core/v1" + "k8s.io/api/apps" + "k8s.io/api/extensions" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go index 9f7395c8f91..5c9719263b5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/generated.pb.go @@ -55,7 +55,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" @@ -4812,7 +4812,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/apps/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/apps/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go index a6c0bfb296b..a7369697fec 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.generated.go @@ -30,7 +30,7 @@ import ( pkg6_runtime "k8s.io/apimachinery/pkg/runtime" pkg2_types "k8s.io/apimachinery/pkg/types" pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" - pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg3_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go index adfd83854ab..f6870c61482 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) const ( diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go index c2c25db82ed..48af2aa423d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.conversion.go @@ -25,8 +25,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - apps "k8s.io/client-go/pkg/apis/apps" + api_v1 "k8s.io/api/core/v1" + apps "k8s.io/api/apps" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go index 5be34398127..16733805206 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go index 9b822c84cb6..a34f7c5303e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/install/install.go index b8a9521a6b7..a2630e21188 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/install/install.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/authentication" - "k8s.io/client-go/pkg/apis/authentication/v1" - "k8s.io/client-go/pkg/apis/authentication/v1beta1" + "k8s.io/api/authentication" + "k8s.io/api/authentication/v1" + "k8s.io/api/authentication/v1beta1" ) func init() { @@ -39,7 +39,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: authentication.GroupName, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/authentication", + ImportPrefix: "k8s.io/api/authentication", RootScopedKinds: sets.NewString("TokenReview"), AddInternalObjectsToScheme: authentication.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/generated.pb.go index e264811365f..d8d90fb8e5d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/generated.pb.go @@ -1253,7 +1253,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/authentication/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/authentication/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/zz_generated.conversion.go index 3a4923cc201..38bbe16c9fa 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authentication "k8s.io/client-go/pkg/apis/authentication" + authentication "k8s.io/api/authentication" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go index 9917cdc6dbe..b2f2373ad74 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.pb.go @@ -1253,7 +1253,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/authentication/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/authentication/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go index 39a61ae613c..e6444842823 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1beta1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authentication "k8s.io/client-go/pkg/apis/authentication" + authentication "k8s.io/api/authentication" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/install/install.go index 33eee6618c6..dff9d3e8cbf 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/install/install.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/authorization" - "k8s.io/client-go/pkg/apis/authorization/v1" - "k8s.io/client-go/pkg/apis/authorization/v1beta1" + "k8s.io/api/authorization" + "k8s.io/api/authorization/v1" + "k8s.io/api/authorization/v1beta1" ) func init() { @@ -39,7 +39,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: authorization.GroupName, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/authorization", + ImportPrefix: "k8s.io/api/authorization", RootScopedKinds: sets.NewString("SubjectAccessReview", "SelfSubjectAccessReview"), AddInternalObjectsToScheme: authorization.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.pb.go index 0204e88dbb0..4486e541b2a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/generated.pb.go @@ -2300,7 +2300,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/authorization/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/authorization/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/zz_generated.conversion.go index 97ebf559a6b..2bd72f9e56e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authorization "k8s.io/client-go/pkg/apis/authorization" + authorization "k8s.io/api/authorization" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go index b2e66e61991..bd48fa20d68 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.pb.go @@ -2300,7 +2300,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/authorization/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/authorization/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go index dc74214f1ee..19cd85118d5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1beta1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - authorization "k8s.io/client-go/pkg/apis/authorization" + authorization "k8s.io/api/authorization" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/install.go index 0ecc0af9b7b..f7b7b1fe094 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/install/install.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/autoscaling" - "k8s.io/client-go/pkg/apis/autoscaling/v1" - "k8s.io/client-go/pkg/apis/autoscaling/v2alpha1" + "k8s.io/api/autoscaling" + "k8s.io/api/autoscaling/v1" + "k8s.io/api/autoscaling/v2alpha1" ) func init() { @@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: autoscaling.GroupName, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v2alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/autoscaling", + ImportPrefix: "k8s.io/api/autoscaling", AddInternalObjectsToScheme: autoscaling.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/conversion.go index 3e6a320a2cf..0da8f735e48 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/conversion.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/autoscaling" + "k8s.io/api/autoscaling" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go index 552c980ada0..ccd6258b381 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/generated.pb.go @@ -52,7 +52,7 @@ import math "math" import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -3692,7 +3692,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/autoscaling/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/autoscaling/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go index fc01e4d9536..256f5f3470c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg3_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" - pkg4_v1 "k8s.io/client-go/pkg/api/v1" + pkg4_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go index 4132f529113..c8e6e155782 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/types.go @@ -19,7 +19,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // CrossVersionObjectReference contains enough information to let you identify the referred resource. diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go index 12c0648499f..849419242de 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/zz_generated.conversion.go @@ -26,8 +26,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - autoscaling "k8s.io/client-go/pkg/apis/autoscaling" + api_v1 "k8s.io/api/core/v1" + autoscaling "k8s.io/api/autoscaling" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/defaults.go index 7533cc4a362..c353d10fbca 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/defaults.go @@ -18,8 +18,8 @@ package v2alpha1 import ( "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/autoscaling" + "k8s.io/api/core/v1" + "k8s.io/api/autoscaling" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.pb.go index 47fb3d5f19e..a077d18f760 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.pb.go @@ -49,7 +49,7 @@ import math "math" import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -3310,7 +3310,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/autoscaling/v2alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.generated.go index 5f984e4f5c5..20a1ccf948a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg1_resource "k8s.io/apimachinery/pkg/api/resource" pkg3_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg4_types "k8s.io/apimachinery/pkg/types" - pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg2_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.go index bbdf7b09bf7..19a83fad915 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/types.go @@ -19,7 +19,7 @@ package v2alpha1 import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // CrossVersionObjectReference contains enough information to let you identify the referred resource. diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go index 698ff6d1df8..eeb912da78b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go @@ -26,8 +26,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - v1 "k8s.io/client-go/pkg/api/v1" - autoscaling "k8s.io/client-go/pkg/apis/autoscaling" + v1 "k8s.io/api/core/v1" + autoscaling "k8s.io/api/autoscaling" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/batch/install/install.go index d37f31820df..585182262a8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/install/install.go @@ -23,9 +23,9 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/batch" - "k8s.io/client-go/pkg/apis/batch/v1" - "k8s.io/client-go/pkg/apis/batch/v2alpha1" + "k8s.io/api/batch" + "k8s.io/api/batch/v1" + "k8s.io/api/batch/v2alpha1" ) func init() { @@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: batch.GroupName, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v2alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/batch", + ImportPrefix: "k8s.io/api/batch", AddInternalObjectsToScheme: batch.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/conversion.go index 7f2bc9d1574..dda4de7d13a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/conversion.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/batch" + v1 "k8s.io/api/core/v1" + "k8s.io/api/batch" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go index bcc6cd9ce12..434c086941b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/generated.pb.go @@ -39,7 +39,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -1522,7 +1522,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/batch/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/batch/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go index a7693119cae..f1f81681897 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.generated.go @@ -29,7 +29,7 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" - pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg3_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go index bcc8c20891a..0ed4d404baf 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/types.go @@ -18,7 +18,7 @@ package v1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // +genclient=true diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go index 3e3e61dceb5..92d4f38030d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.conversion.go @@ -25,8 +25,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - batch "k8s.io/client-go/pkg/apis/batch" + api_v1 "k8s.io/api/core/v1" + batch "k8s.io/api/batch" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go index 22bf9458750..3e856dda16e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go index 417024f62d7..78ba4d9c8b5 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go index 28df224b886..5ba55a187ac 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.pb.go @@ -40,7 +40,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -1453,7 +1453,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/batch/v2alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/batch/v2alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go index 9e72e7d22d5..ff90dc21134 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.generated.go @@ -29,8 +29,8 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" pkg6_intstr "k8s.io/apimachinery/pkg/util/intstr" - pkg4_v1 "k8s.io/client-go/pkg/api/v1" - pkg3_v1 "k8s.io/client-go/pkg/apis/batch/v1" + pkg4_v1 "k8s.io/api/core/v1" + pkg3_v1 "k8s.io/api/batch/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go index d5b3c487fd7..dd0488c1202 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/types.go @@ -18,8 +18,8 @@ package v2alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" - batchv1 "k8s.io/client-go/pkg/apis/batch/v1" + "k8s.io/api/core/v1" + batchv1 "k8s.io/api/batch/v1" ) // JobTemplate describes a template for creating copies of a predefined pod. diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go index b422c465821..d9a61732d38 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.conversion.go @@ -25,9 +25,9 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - batch "k8s.io/client-go/pkg/apis/batch" - batch_v1 "k8s.io/client-go/pkg/apis/batch/v1" + api_v1 "k8s.io/api/core/v1" + batch "k8s.io/api/batch" + batch_v1 "k8s.io/api/batch/v1" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go index 9442a216d89..03ec12f2817 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go @@ -24,8 +24,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/client-go/pkg/api/v1" - batch_v1 "k8s.io/client-go/pkg/apis/batch/v1" + api_v1 "k8s.io/api/core/v1" + batch_v1 "k8s.io/api/batch/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go index 1c0bd0ee0af..f1d8b3f988c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v2alpha1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/install/install.go index 8850e07aa00..4095db7083d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/install/install.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/certificates" - "k8s.io/client-go/pkg/apis/certificates/v1beta1" + "k8s.io/api/certificates" + "k8s.io/api/certificates/v1beta1" ) func init() { @@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: certificates.GroupName, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/certificates", + ImportPrefix: "k8s.io/api/certificates", RootScopedKinds: sets.NewString("CertificateSigningRequest"), AddInternalObjectsToScheme: certificates.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.pb.go index 347df9826cb..97f7da8dfec 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.pb.go @@ -1634,7 +1634,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/certificates/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/certificates/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/zz_generated.conversion.go index f1331784859..a6adedd1a15 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1beta1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1beta1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - certificates "k8s.io/client-go/pkg/apis/certificates" + certificates "k8s.io/api/certificates" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/install/install.go index 1f968e861c6..30d1104ab4b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/install/install.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/extensions" - "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/extensions" + "k8s.io/api/extensions/v1beta1" ) func init() { @@ -38,7 +38,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: extensions.GroupName, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/extensions", + ImportPrefix: "k8s.io/api/extensions", RootScopedKinds: sets.NewString("PodSecurityPolicy", "ThirdPartyResource"), AddInternalObjectsToScheme: extensions.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go index cec1e5e4354..1a8ce2f3b49 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/conversion.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/pkg/api" - v1 "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions" - "k8s.io/client-go/pkg/apis/networking" + v1 "k8s.io/api/core/v1" + "k8s.io/api/extensions" + "k8s.io/api/networking" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go index a644e5ab9d3..0f9da5e1a35 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/defaults.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go index 871bd924dfd..03c1d73fab1 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.pb.go @@ -93,7 +93,7 @@ import math "math" import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" @@ -11887,7 +11887,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/extensions/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/extensions/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go index 8d4e39b66ea..aed651aa41a 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.generated.go @@ -29,7 +29,7 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr" - pkg4_v1 "k8s.io/client-go/pkg/api/v1" + pkg4_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go index 8f5ad4807c4..5b2d773c446 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/types.go @@ -20,8 +20,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/pkg/api/v1" - appsv1beta1 "k8s.io/client-go/pkg/apis/apps/v1beta1" + "k8s.io/api/core/v1" + appsv1beta1 "k8s.io/api/apps/v1beta1" ) // describes the attributes of a scale subresource diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index efb81430a30..4610ccc070d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.conversion.go @@ -26,8 +26,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions" + api_v1 "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go index e6d3c55261a..4e81dd30e8e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index 770faa513f7..be0a5152d6e 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v1beta1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/conversion.go index 21ec62576df..1942068b953 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/conversion.go @@ -21,8 +21,8 @@ import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/api/v1" - "k8s.io/client-go/pkg/apis/extensions" + "k8s.io/api/core/v1" + "k8s.io/api/extensions" ) func addConversionFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/defaults.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/defaults.go index 7567cf751a3..0a7b548cee2 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/defaults.go @@ -18,7 +18,7 @@ package v1 import ( "k8s.io/apimachinery/pkg/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func addDefaultingFuncs(scheme *runtime.Scheme) error { diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/generated.pb.go index 671557dd56d..a96372e9280 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/generated.pb.go @@ -42,7 +42,7 @@ import k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v import k8s_io_apimachinery_pkg_util_intstr "k8s.io/apimachinery/pkg/util/intstr" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -1295,7 +1295,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/networking/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/networking/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.generated.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.generated.go index da04aee4217..114b58d990f 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.generated.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" pkg4_intstr "k8s.io/apimachinery/pkg/util/intstr" - pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg3_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.go index a31026a67d6..a9c5ce95401 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/types.go @@ -19,7 +19,7 @@ package v1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // +genclient=true diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.conversion.go index 500438e92f9..2ce54a8781f 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.conversion.go @@ -26,8 +26,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" api "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" - networking "k8s.io/client-go/pkg/apis/networking" + api_v1 "k8s.io/api/core/v1" + networking "k8s.io/api/networking" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.deepcopy.go index 6d9b335d428..76a27534fbc 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/networking/v1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/policy/install/install.go index 6253d5bc295..72acf1c2e56 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/install/install.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/policy" - "k8s.io/client-go/pkg/apis/policy/v1beta1" + "k8s.io/api/policy" + "k8s.io/api/policy/v1beta1" ) func init() { @@ -37,7 +37,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: policy.GroupName, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/policy", + ImportPrefix: "k8s.io/api/policy", AddInternalObjectsToScheme: policy.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go index 0116ded29b5..b114ca52e09 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/generated.pb.go @@ -1396,7 +1396,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/policy/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/policy/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go index b10663a02c9..a4f1650567d 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/zz_generated.conversion.go @@ -25,7 +25,7 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" intstr "k8s.io/apimachinery/pkg/util/intstr" - policy "k8s.io/client-go/pkg/apis/policy" + policy "k8s.io/api/policy" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/install/install.go index f92c11e06c1..1bce72997ac 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/install/install.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/rbac" - "k8s.io/client-go/pkg/apis/rbac/v1alpha1" - "k8s.io/client-go/pkg/apis/rbac/v1beta1" + "k8s.io/api/rbac" + "k8s.io/api/rbac/v1alpha1" + "k8s.io/api/rbac/v1beta1" ) func init() { @@ -39,7 +39,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: rbac.GroupName, VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version, v1alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/rbac", + ImportPrefix: "k8s.io/api/rbac", RootScopedKinds: sets.NewString("ClusterRole", "ClusterRoleBinding"), AddInternalObjectsToScheme: rbac.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/conversion.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/conversion.go index 22b3c407675..d22b128f056 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/conversion.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/conversion" "k8s.io/apimachinery/pkg/runtime/schema" - api "k8s.io/client-go/pkg/apis/rbac" + api "k8s.io/api/rbac" ) // allAuthenticated matches k8s.io/apiserver/pkg/authentication/user.AllAuthenticated, diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go index 3977142e46d..11b30f0a53c 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.pb.go @@ -2762,7 +2762,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/rbac/v1alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/rbac/v1alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go index a3315156fdf..5dfc5707271 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - rbac "k8s.io/client-go/pkg/apis/rbac" + rbac "k8s.io/api/rbac" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go index 07a719394ae..86261607b2b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.pb.go @@ -2762,7 +2762,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/rbac/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/rbac/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go index 56e2c4ee428..80331b3efc4 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1beta1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1beta1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - rbac "k8s.io/client-go/pkg/apis/rbac" + rbac "k8s.io/api/rbac" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/settings/install/install.go index ccdc70400a2..76ed2c1b2bb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/install/install.go @@ -23,8 +23,8 @@ import ( "k8s.io/apimachinery/pkg/apimachinery/registered" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/settings" - "k8s.io/client-go/pkg/apis/settings/v1alpha1" + "k8s.io/api/settings" + "k8s.io/api/settings/v1alpha1" ) func init() { @@ -37,7 +37,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: settings.GroupName, VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/settings", + ImportPrefix: "k8s.io/api/settings", AddInternalObjectsToScheme: settings.AddToScheme, }, announced.VersionToSchemeFunc{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/generated.pb.go index 64b15b1d224..cae2b9e23f7 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/generated.pb.go @@ -35,7 +35,7 @@ import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" -import k8s_io_kubernetes_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_kubernetes_pkg_api_v1 "k8s.io/api/core/v1" import strings "strings" import reflect "reflect" @@ -887,7 +887,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/settings/v1alpha1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/settings/v1alpha1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/types.go b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/types.go index 0565f7c60a8..6de2e7db0f8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/types.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/types.go @@ -18,7 +18,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // +genclient=true diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.conversion.go index 45330186165..d0d80d27e89 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.conversion.go @@ -24,8 +24,8 @@ import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" api "k8s.io/client-go/pkg/api" - v1 "k8s.io/client-go/pkg/api/v1" - settings "k8s.io/client-go/pkg/apis/settings" + v1 "k8s.io/api/core/v1" + settings "k8s.io/api/settings" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go index 4f2e35494cd..59184d8863b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - api_v1 "k8s.io/client-go/pkg/api/v1" + api_v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.defaults.go b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.defaults.go index c178a3072c2..9a5b56711da 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.defaults.go +++ b/staging/src/k8s.io/client-go/pkg/apis/settings/v1alpha1/zz_generated.defaults.go @@ -22,7 +22,7 @@ package v1alpha1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" ) // RegisterDefaults adds defaulters functions to the given scheme. diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go index 4608a54ea70..15fa5929217 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/pkg/api" - "k8s.io/client-go/pkg/apis/storage" - "k8s.io/client-go/pkg/apis/storage/v1" - "k8s.io/client-go/pkg/apis/storage/v1beta1" + "k8s.io/api/storage" + "k8s.io/api/storage/v1" + "k8s.io/api/storage/v1beta1" ) func init() { @@ -39,7 +39,7 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: storage.GroupName, VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, - ImportPrefix: "k8s.io/client-go/pkg/apis/storage", + ImportPrefix: "k8s.io/api/storage", RootScopedKinds: sets.NewString("StorageClass"), AddInternalObjectsToScheme: storage.AddToScheme, }, diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/generated.pb.go index cc241c5b086..fdc96ed43d8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/generated.pb.go @@ -709,7 +709,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/storage/v1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/storage/v1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/zz_generated.conversion.go index aac6bac2956..acaba83c30b 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - storage "k8s.io/client-go/pkg/apis/storage" + storage "k8s.io/api/storage" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go index 8f446c0bfde..5f715881ff8 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/generated.pb.go @@ -709,7 +709,7 @@ var ( ) func init() { - proto.RegisterFile("k8s.io/client-go/pkg/apis/storage/v1beta1/generated.proto", fileDescriptorGenerated) + proto.RegisterFile("k8s.io/api/storage/v1beta1/generated.proto", fileDescriptorGenerated) } var fileDescriptorGenerated = []byte{ diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go index 630fff327b0..166da077aeb 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1beta1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - storage "k8s.io/client-go/pkg/apis/storage" + storage "k8s.io/api/storage" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/client-go/rest/client_test.go b/staging/src/k8s.io/client-go/rest/client_test.go index 71707d43a37..210b2915cfe 100644 --- a/staging/src/k8s.io/client-go/rest/client_test.go +++ b/staging/src/k8s.io/client-go/rest/client_test.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" - v1beta1 "k8s.io/client-go/pkg/apis/extensions/v1beta1" + "k8s.io/api/core/v1" + v1beta1 "k8s.io/api/extensions/v1beta1" utiltesting "k8s.io/client-go/util/testing" ) diff --git a/staging/src/k8s.io/client-go/rest/config.go b/staging/src/k8s.io/client-go/rest/config.go index b4511486592..5bca6142198 100644 --- a/staging/src/k8s.io/client-go/rest/config.go +++ b/staging/src/k8s.io/client-go/rest/config.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/pkg/version" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" certutil "k8s.io/client-go/util/cert" diff --git a/staging/src/k8s.io/client-go/rest/config_test.go b/staging/src/k8s.io/client-go/rest/config_test.go index 784a1ed831a..34033c21caa 100644 --- a/staging/src/k8s.io/client-go/rest/config_test.go +++ b/staging/src/k8s.io/client-go/rest/config_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/util/flowcontrol" diff --git a/staging/src/k8s.io/client-go/rest/request.go b/staging/src/k8s.io/client-go/rest/request.go index cfb4511bab8..b5b635c72b6 100644 --- a/staging/src/k8s.io/client-go/rest/request.go +++ b/staging/src/k8s.io/client-go/rest/request.go @@ -43,7 +43,7 @@ import ( "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/client-go/tools/metrics" "k8s.io/client-go/util/flowcontrol" diff --git a/staging/src/k8s.io/client-go/rest/request_test.go b/staging/src/k8s.io/client-go/rest/request_test.go index cedac794aed..fd189b50307 100755 --- a/staging/src/k8s.io/client-go/rest/request_test.go +++ b/staging/src/k8s.io/client-go/rest/request_test.go @@ -48,7 +48,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclientwatch "k8s.io/client-go/rest/watch" "k8s.io/client-go/util/flowcontrol" utiltesting "k8s.io/client-go/util/testing" diff --git a/staging/src/k8s.io/client-go/rest/url_utils_test.go b/staging/src/k8s.io/client-go/rest/url_utils_test.go index e53644f7e5c..6321678a40a 100644 --- a/staging/src/k8s.io/client-go/rest/url_utils_test.go +++ b/staging/src/k8s.io/client-go/rest/url_utils_test.go @@ -20,7 +20,7 @@ import ( "path" "testing" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func TestValidatesHostParameter(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/rest/watch/decoder_test.go b/staging/src/k8s.io/client-go/rest/watch/decoder_test.go index d78da56a8fa..db59fe16e18 100644 --- a/staging/src/k8s.io/client-go/rest/watch/decoder_test.go +++ b/staging/src/k8s.io/client-go/rest/watch/decoder_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclientwatch "k8s.io/client-go/rest/watch" ) diff --git a/staging/src/k8s.io/client-go/rest/watch/encoder_test.go b/staging/src/k8s.io/client-go/rest/watch/encoder_test.go index b9381b4603e..3f930141dee 100644 --- a/staging/src/k8s.io/client-go/rest/watch/encoder_test.go +++ b/staging/src/k8s.io/client-go/rest/watch/encoder_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer/streaming" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclientwatch "k8s.io/client-go/rest/watch" ) diff --git a/staging/src/k8s.io/client-go/tools/cache/controller_test.go b/staging/src/k8s.io/client-go/tools/cache/controller_test.go index f8e6cec5382..ab96d69fb04 100644 --- a/staging/src/k8s.io/client-go/tools/cache/controller_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/controller_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" fcache "k8s.io/client-go/tools/cache/testing" "github.com/google/gofuzz" diff --git a/staging/src/k8s.io/client-go/tools/cache/index_test.go b/staging/src/k8s.io/client-go/tools/cache/index_test.go index 418dca4417d..7a44763c0bb 100644 --- a/staging/src/k8s.io/client-go/tools/cache/index_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/index_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func testIndexFunc(obj interface{}) ([]string, error) { diff --git a/staging/src/k8s.io/client-go/tools/cache/mutation_detector_test.go b/staging/src/k8s.io/client-go/tools/cache/mutation_detector_test.go index b2fe5fb9b6b..a1f8f11afdf 100644 --- a/staging/src/k8s.io/client-go/tools/cache/mutation_detector_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/mutation_detector_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func TestMutationDetector(t *testing.T) { diff --git a/staging/src/k8s.io/client-go/tools/cache/reflector_test.go b/staging/src/k8s.io/client-go/tools/cache/reflector_test.go index ae2b75fa850..3f64c78feb9 100644 --- a/staging/src/k8s.io/client-go/tools/cache/reflector_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/reflector_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) var nevererrc chan error diff --git a/staging/src/k8s.io/client-go/tools/cache/shared_informer_test.go b/staging/src/k8s.io/client-go/tools/cache/shared_informer_test.go index 216ba923c24..6f4772a8158 100644 --- a/staging/src/k8s.io/client-go/tools/cache/shared_informer_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/shared_informer_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" fcache "k8s.io/client-go/tools/cache/testing" ) diff --git a/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go b/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go index fd06fc89c1d..ab8b8f9efd9 100644 --- a/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go +++ b/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func NewFakeControllerSource() *FakeControllerSource { diff --git a/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source_test.go b/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source_test.go index 2a03171c6ea..0186e3700e2 100644 --- a/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source_test.go +++ b/staging/src/k8s.io/client-go/tools/cache/testing/fake_controller_source_test.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // ensure the watch delivers the requested and only the requested items. diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go index 103648f1dc7..a8698af2432 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/client_config.go @@ -27,7 +27,7 @@ import ( "github.com/golang/glog" "github.com/imdario/mergo" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" clientauth "k8s.io/client-go/tools/auth" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go b/staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go index 32ffd197ced..3f02111bd56 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/merged_client_builder.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" ) diff --git a/staging/src/k8s.io/client-go/tools/portforward/portforward.go b/staging/src/k8s.io/client-go/tools/portforward/portforward.go index 2071b25a4dd..4944ed8bcda 100644 --- a/staging/src/k8s.io/client-go/tools/portforward/portforward.go +++ b/staging/src/k8s.io/client-go/tools/portforward/portforward.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // TODO move to API machinery and re-unify with kubelet/server/portfoward diff --git a/staging/src/k8s.io/client-go/tools/record/event.go b/staging/src/k8s.io/client-go/tools/record/event.go index 6b2fad4096f..f1390daaa1d 100644 --- a/staging/src/k8s.io/client-go/tools/record/event.go +++ b/staging/src/k8s.io/client-go/tools/record/event.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/pkg/api/v1/ref" restclient "k8s.io/client-go/rest" diff --git a/staging/src/k8s.io/client-go/tools/record/event_test.go b/staging/src/k8s.io/client-go/tools/record/event_test.go index bc09f68fe96..a239f3f1aea 100644 --- a/staging/src/k8s.io/client-go/tools/record/event_test.go +++ b/staging/src/k8s.io/client-go/tools/record/event_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/pkg/api/v1/ref" restclient "k8s.io/client-go/rest" ) diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache.go b/staging/src/k8s.io/client-go/tools/record/events_cache.go index bde110bf35f..37432ae6481 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/strategicpatch" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) const ( diff --git a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go index 2fdba3b8ed5..39e8f7e04e7 100644 --- a/staging/src/k8s.io/client-go/tools/record/events_cache_test.go +++ b/staging/src/k8s.io/client-go/tools/record/events_cache_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/clock" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) func makeObjectReference(kind, name, namespace string) v1.ObjectReference { diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v1.go b/staging/src/k8s.io/client-go/tools/remotecommand/v1.go index 1db917c0b78..db01a9d97ce 100644 --- a/staging/src/k8s.io/client-go/tools/remotecommand/v1.go +++ b/staging/src/k8s.io/client-go/tools/remotecommand/v1.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "k8s.io/apimachinery/pkg/util/httpstream" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // streamProtocolV1 implements the first version of the streaming exec & attach diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v2.go b/staging/src/k8s.io/client-go/tools/remotecommand/v2.go index 95346a4399b..ad2a8add486 100644 --- a/staging/src/k8s.io/client-go/tools/remotecommand/v2.go +++ b/staging/src/k8s.io/client-go/tools/remotecommand/v2.go @@ -24,7 +24,7 @@ import ( "sync" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // streamProtocolV2 implements version 2 of the streaming protocol for attach diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go b/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go index adebfaed8d8..f8a46a15e95 100644 --- a/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go +++ b/staging/src/k8s.io/client-go/tools/remotecommand/v2_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/httpstream" "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) type fakeReader struct { diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/v3.go b/staging/src/k8s.io/client-go/tools/remotecommand/v3.go index 03b9e2a683e..223173222fd 100644 --- a/staging/src/k8s.io/client-go/tools/remotecommand/v3.go +++ b/staging/src/k8s.io/client-go/tools/remotecommand/v3.go @@ -23,7 +23,7 @@ import ( "sync" "k8s.io/apimachinery/pkg/util/runtime" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // streamProtocolV3 implements version 3 of the streaming protocol for attach diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go index 189e0a75152..4057de404e2 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apiserver/apiservice_controller.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" v1informers "k8s.io/client-go/informers/core/v1" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go index ec57144e878..7bfe082f0c8 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" v1informers "k8s.io/client-go/informers/core/v1" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" diff --git a/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go b/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go index 39e3c46fd4f..502fc8a64ba 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1listers "k8s.io/client-go/listers/core/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" clienttesting "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/kube-aggregator/pkg/apis/apiregistration" diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.generated.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.generated.go index e23de0bc5d1..00c2c5c3a11 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg4_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg3_types "k8s.io/apimachinery/pkg/types" - pkg2_v1 "k8s.io/client-go/pkg/api/v1" + pkg2_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go index 89261fbaa80..741eff7d114 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1alpha1/types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // a list of values for a given metric for some set of objects diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.pb.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.pb.go index 96a6fb03618..eab062d2dd3 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.pb.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/generated.pb.go @@ -39,7 +39,7 @@ import math "math" import k8s_io_apimachinery_pkg_api_resource "k8s.io/apimachinery/pkg/api/resource" -import k8s_io_client_go_pkg_api_v1 "k8s.io/client-go/pkg/api/v1" +import k8s_io_client_go_pkg_api_v1 "k8s.io/api/core/v1" import github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go index 28e173e80cd..b8e6dbf95d9 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.generated.go @@ -28,7 +28,7 @@ import ( pkg4_resource "k8s.io/apimachinery/pkg/api/resource" pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" pkg2_types "k8s.io/apimachinery/pkg/types" - pkg3_v1 "k8s.io/client-go/pkg/api/v1" + pkg3_v1 "k8s.io/api/core/v1" "reflect" "runtime" time "time" diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go index 289c1faeed0..4cd0102e971 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go @@ -18,7 +18,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/pkg/api/v1" + "k8s.io/api/core/v1" ) // +genclient=true diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go index a5352923674..88cb39b9920 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.conversion.go @@ -23,7 +23,7 @@ package v1alpha1 import ( conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" metrics "k8s.io/metrics/pkg/apis/metrics" unsafe "unsafe" ) diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go index ceedcca63ad..83abb21848d 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - v1 "k8s.io/client-go/pkg/api/v1" + v1 "k8s.io/api/core/v1" reflect "reflect" ) diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index ef7480e7c7a..e9299a0d73f 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -35,7 +35,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + policy "k8s.io/api/policy/v1beta1" "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/test/e2e/framework" diff --git a/test/e2e/disruption.go b/test/e2e/disruption.go index 01f7af39fea..1d6020d9245 100644 --- a/test/e2e/disruption.go +++ b/test/e2e/disruption.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - "k8s.io/client-go/pkg/api/v1" - extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1" - policy "k8s.io/client-go/pkg/apis/policy/v1beta1" + "k8s.io/api/core/v1" + extensions "k8s.io/api/extensions/v1beta1" + policy "k8s.io/api/policy/v1beta1" "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/e2e/generated_clientset.go b/test/e2e/generated_clientset.go index a9fb852c26d..b5c50b77b30 100644 --- a/test/e2e/generated_clientset.go +++ b/test/e2e/generated_clientset.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" "k8s.io/api/core/v1" batchv1 "k8s.io/api/batch/v1" batchv2alpha1 "k8s.io/api/batch/v2alpha1" diff --git a/test/integration/scheduler/extender_test.go b/test/integration/scheduler/extender_test.go index fa567356c9e..7833b7c9c44 100644 --- a/test/integration/scheduler/extender_test.go +++ b/test/integration/scheduler/extender_test.go @@ -31,7 +31,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/test/integration/scheduler/scheduler_test.go b/test/integration/scheduler/scheduler_test.go index d5ba7aa83a5..5276391d0a2 100644 --- a/test/integration/scheduler/scheduler_test.go +++ b/test/integration/scheduler/scheduler_test.go @@ -28,7 +28,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" clientv1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" diff --git a/test/integration/scheduler_perf/util.go b/test/integration/scheduler_perf/util.go index 6f60630430f..f13a907a208 100644 --- a/test/integration/scheduler_perf/util.go +++ b/test/integration/scheduler_perf/util.go @@ -22,7 +22,7 @@ import ( "github.com/golang/glog" clientv1core "k8s.io/client-go/kubernetes/typed/core/v1" - clientv1 "k8s.io/client-go/pkg/api/v1" + clientv1 "k8s.io/api/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/record" "k8s.io/kubernetes/pkg/api" diff --git a/test/integration/thirdparty/client-go_test.go b/test/integration/thirdparty/client-go_test.go index 1e00e655bc5..cbb2d5218b1 100644 --- a/test/integration/thirdparty/client-go_test.go +++ b/test/integration/thirdparty/client-go_test.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/serializer" "k8s.io/client-go/kubernetes" - apiv1 "k8s.io/client-go/pkg/api/v1" + apiv1 "k8s.io/api/core/v1" "k8s.io/client-go/rest" "k8s.io/kubernetes/test/integration/framework"