diff --git a/discovery/discovery_client.go b/discovery/discovery_client.go index 0ee46b86..69880146 100644 --- a/discovery/discovery_client.go +++ b/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/discovery/discovery_client_test.go b/discovery/discovery_client_test.go index f4058991..94b1b438 100644 --- a/discovery/discovery_client_test.go +++ b/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/discovery/fake/discovery.go b/discovery/fake/discovery.go index eb2be254..3b3dc640 100644 --- a/discovery/fake/discovery.go +++ b/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/discovery/helper_blackbox_test.go b/discovery/helper_blackbox_test.go index 7b7236bc..24a00081 100644 --- a/discovery/helper_blackbox_test.go +++ b/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/dynamic/client.go b/dynamic/client.go index a0c18209..7389df87 100644 --- a/dynamic/client.go +++ b/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/examples/create-update-delete-deployment/main.go b/examples/create-update-delete-deployment/main.go index 2913510f..db9450af 100644 --- a/examples/create-update-delete-deployment/main.go +++ b/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/examples/third-party-resources-deprecated/client/tpr.go b/examples/third-party-resources-deprecated/client/tpr.go index 9f69e1f3..d426ecbc 100644 --- a/examples/third-party-resources-deprecated/client/tpr.go +++ b/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/examples/third-party-resources-deprecated/controller/controller.go b/examples/third-party-resources-deprecated/controller/controller.go index 15355296..d01a5617 100644 --- a/examples/third-party-resources-deprecated/controller/controller.go +++ b/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/examples/third-party-resources-deprecated/main.go b/examples/third-party-resources-deprecated/main.go index 87770683..d6964e77 100644 --- a/examples/third-party-resources-deprecated/main.go +++ b/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/examples/workqueue/main.go b/examples/workqueue/main.go index c255ed76..d9245497 100644 --- a/examples/workqueue/main.go +++ b/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/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 868c16f2..26d3a12c 100644 --- a/informers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/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/informers/admissionregistration/v1alpha1/initializerconfiguration.go b/informers/admissionregistration/v1alpha1/initializerconfiguration.go index 78d49f47..6a3bd547 100644 --- a/informers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/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/informers/apps/v1beta1/controllerrevision.go b/informers/apps/v1beta1/controllerrevision.go index ef4dfce6..ac57753c 100644 --- a/informers/apps/v1beta1/controllerrevision.go +++ b/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/informers/apps/v1beta1/deployment.go b/informers/apps/v1beta1/deployment.go index 41ed724f..7e067c8a 100644 --- a/informers/apps/v1beta1/deployment.go +++ b/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/informers/apps/v1beta1/statefulset.go b/informers/apps/v1beta1/statefulset.go index 4ee88dd6..641f88d5 100644 --- a/informers/apps/v1beta1/statefulset.go +++ b/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/informers/autoscaling/v1/horizontalpodautoscaler.go b/informers/autoscaling/v1/horizontalpodautoscaler.go index 7469a6b1..e89778c3 100644 --- a/informers/autoscaling/v1/horizontalpodautoscaler.go +++ b/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/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 81cd5eeb..cac23b2a 100644 --- a/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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/informers/batch/v1/job.go b/informers/batch/v1/job.go index c0e48c35..268045ed 100644 --- a/informers/batch/v1/job.go +++ b/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/informers/batch/v2alpha1/cronjob.go b/informers/batch/v2alpha1/cronjob.go index db36dbdc..5bd4b3a1 100644 --- a/informers/batch/v2alpha1/cronjob.go +++ b/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/informers/certificates/v1beta1/certificatesigningrequest.go b/informers/certificates/v1beta1/certificatesigningrequest.go index d4a139b6..b28aac7a 100644 --- a/informers/certificates/v1beta1/certificatesigningrequest.go +++ b/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/informers/core/v1/componentstatus.go b/informers/core/v1/componentstatus.go index 62a67d0d..b7918650 100644 --- a/informers/core/v1/componentstatus.go +++ b/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/informers/core/v1/configmap.go b/informers/core/v1/configmap.go index 2dc10f3a..93a1747c 100644 --- a/informers/core/v1/configmap.go +++ b/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/informers/core/v1/endpoints.go b/informers/core/v1/endpoints.go index b0ea2bcb..e3a5d7b0 100644 --- a/informers/core/v1/endpoints.go +++ b/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/informers/core/v1/event.go b/informers/core/v1/event.go index bc314c42..9d3800e3 100644 --- a/informers/core/v1/event.go +++ b/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/informers/core/v1/limitrange.go b/informers/core/v1/limitrange.go index 65edd820..31ccf04e 100644 --- a/informers/core/v1/limitrange.go +++ b/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/informers/core/v1/namespace.go b/informers/core/v1/namespace.go index 281fd416..a10ced1e 100644 --- a/informers/core/v1/namespace.go +++ b/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/informers/core/v1/node.go b/informers/core/v1/node.go index f66010ed..673f98cd 100644 --- a/informers/core/v1/node.go +++ b/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/informers/core/v1/persistentvolume.go b/informers/core/v1/persistentvolume.go index 3a552583..77b20811 100644 --- a/informers/core/v1/persistentvolume.go +++ b/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/informers/core/v1/persistentvolumeclaim.go b/informers/core/v1/persistentvolumeclaim.go index 5a79590d..42723522 100644 --- a/informers/core/v1/persistentvolumeclaim.go +++ b/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/informers/core/v1/pod.go b/informers/core/v1/pod.go index 8c58aee6..9ea1a3ca 100644 --- a/informers/core/v1/pod.go +++ b/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/informers/core/v1/podtemplate.go b/informers/core/v1/podtemplate.go index 42990642..32ba9ce7 100644 --- a/informers/core/v1/podtemplate.go +++ b/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/informers/core/v1/replicationcontroller.go b/informers/core/v1/replicationcontroller.go index e39b46de..f9da21d3 100644 --- a/informers/core/v1/replicationcontroller.go +++ b/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/informers/core/v1/resourcequota.go b/informers/core/v1/resourcequota.go index afa1f652..38d6a74f 100644 --- a/informers/core/v1/resourcequota.go +++ b/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/informers/core/v1/secret.go b/informers/core/v1/secret.go index 7b8f58c9..d2c743f4 100644 --- a/informers/core/v1/secret.go +++ b/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/informers/core/v1/service.go b/informers/core/v1/service.go index b20a43b4..614b8114 100644 --- a/informers/core/v1/service.go +++ b/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/informers/core/v1/serviceaccount.go b/informers/core/v1/serviceaccount.go index 911078ea..1542dd0c 100644 --- a/informers/core/v1/serviceaccount.go +++ b/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/informers/extensions/v1beta1/daemonset.go b/informers/extensions/v1beta1/daemonset.go index 77f870e0..a19de773 100644 --- a/informers/extensions/v1beta1/daemonset.go +++ b/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/informers/extensions/v1beta1/deployment.go b/informers/extensions/v1beta1/deployment.go index f74b35e0..3f69845b 100644 --- a/informers/extensions/v1beta1/deployment.go +++ b/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/informers/extensions/v1beta1/ingress.go b/informers/extensions/v1beta1/ingress.go index e07f6fb2..ad59ed89 100644 --- a/informers/extensions/v1beta1/ingress.go +++ b/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/informers/extensions/v1beta1/podsecuritypolicy.go b/informers/extensions/v1beta1/podsecuritypolicy.go index 12fec02d..9319b794 100644 --- a/informers/extensions/v1beta1/podsecuritypolicy.go +++ b/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/informers/extensions/v1beta1/replicaset.go b/informers/extensions/v1beta1/replicaset.go index 8fa8a429..e5726547 100644 --- a/informers/extensions/v1beta1/replicaset.go +++ b/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/informers/extensions/v1beta1/thirdpartyresource.go b/informers/extensions/v1beta1/thirdpartyresource.go index 8a580406..615f01a7 100644 --- a/informers/extensions/v1beta1/thirdpartyresource.go +++ b/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/informers/generic.go b/informers/generic.go index 19b66a52..4d4ecc87 100644 --- a/informers/generic.go +++ b/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/informers/networking/v1/networkpolicy.go b/informers/networking/v1/networkpolicy.go index 46475df8..2b2efc94 100644 --- a/informers/networking/v1/networkpolicy.go +++ b/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/informers/policy/v1beta1/poddisruptionbudget.go b/informers/policy/v1beta1/poddisruptionbudget.go index a8258eaf..d872dc80 100644 --- a/informers/policy/v1beta1/poddisruptionbudget.go +++ b/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/informers/rbac/v1alpha1/clusterrole.go b/informers/rbac/v1alpha1/clusterrole.go index c378311b..2bd4614e 100644 --- a/informers/rbac/v1alpha1/clusterrole.go +++ b/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/informers/rbac/v1alpha1/clusterrolebinding.go b/informers/rbac/v1alpha1/clusterrolebinding.go index bf101187..7a7a9d61 100644 --- a/informers/rbac/v1alpha1/clusterrolebinding.go +++ b/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/informers/rbac/v1alpha1/role.go b/informers/rbac/v1alpha1/role.go index efaf45a7..6b61fd57 100644 --- a/informers/rbac/v1alpha1/role.go +++ b/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/informers/rbac/v1alpha1/rolebinding.go b/informers/rbac/v1alpha1/rolebinding.go index c7b515b6..6faf708a 100644 --- a/informers/rbac/v1alpha1/rolebinding.go +++ b/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/informers/rbac/v1beta1/clusterrole.go b/informers/rbac/v1beta1/clusterrole.go index 852804b5..ba3c04eb 100644 --- a/informers/rbac/v1beta1/clusterrole.go +++ b/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/informers/rbac/v1beta1/clusterrolebinding.go b/informers/rbac/v1beta1/clusterrolebinding.go index 1597da39..8d92e398 100644 --- a/informers/rbac/v1beta1/clusterrolebinding.go +++ b/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/informers/rbac/v1beta1/role.go b/informers/rbac/v1beta1/role.go index 27a595ab..e3ba9dba 100644 --- a/informers/rbac/v1beta1/role.go +++ b/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/informers/rbac/v1beta1/rolebinding.go b/informers/rbac/v1beta1/rolebinding.go index 508f7ec8..b8869444 100644 --- a/informers/rbac/v1beta1/rolebinding.go +++ b/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/informers/settings/v1alpha1/podpreset.go b/informers/settings/v1alpha1/podpreset.go index 6f89088f..a1ad408e 100644 --- a/informers/settings/v1alpha1/podpreset.go +++ b/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/informers/storage/v1/storageclass.go b/informers/storage/v1/storageclass.go index 13030532..035a4528 100644 --- a/informers/storage/v1/storageclass.go +++ b/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/informers/storage/v1beta1/storageclass.go b/informers/storage/v1beta1/storageclass.go index e34548e0..032bda3b 100644 --- a/informers/storage/v1beta1/storageclass.go +++ b/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/kubernetes/fake/register.go b/kubernetes/fake/register.go index 2b3e1667..214700ea 100644 --- a/kubernetes/fake/register.go +++ b/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/kubernetes/scheme/register.go b/kubernetes/scheme/register.go index c4af63a4..9865ad5d 100644 --- a/kubernetes/scheme/register.go +++ b/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/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go b/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go index 1ac48c8f..730577c2 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go +++ b/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/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index 08d68dd0..95252217 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/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/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go index 0f5d2293..38933c81 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_externaladmissionhookconfiguration.go +++ b/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/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go index d57f9044..6f91c13a 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_initializerconfiguration.go +++ b/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/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go b/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go index 25fee850..450ad4e7 100644 --- a/kubernetes/typed/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/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/kubernetes/typed/apps/v1beta1/apps_client.go b/kubernetes/typed/apps/v1beta1/apps_client.go index c18da39f..b854f36d 100644 --- a/kubernetes/typed/apps/v1beta1/apps_client.go +++ b/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/kubernetes/typed/apps/v1beta1/controllerrevision.go b/kubernetes/typed/apps/v1beta1/controllerrevision.go index de24bbb5..8948891f 100644 --- a/kubernetes/typed/apps/v1beta1/controllerrevision.go +++ b/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/kubernetes/typed/apps/v1beta1/deployment.go b/kubernetes/typed/apps/v1beta1/deployment.go index b30965ee..6d4cb081 100644 --- a/kubernetes/typed/apps/v1beta1/deployment.go +++ b/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/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go b/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go index cdf9a27c..f37bf98f 100644 --- a/kubernetes/typed/apps/v1beta1/fake/fake_controllerrevision.go +++ b/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/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go b/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go index 1323ed59..c8f557be 100644 --- a/kubernetes/typed/apps/v1beta1/fake/fake_deployment.go +++ b/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/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go b/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go index c85e470e..fc6f5c08 100644 --- a/kubernetes/typed/apps/v1beta1/fake/fake_statefulset.go +++ b/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/kubernetes/typed/apps/v1beta1/statefulset.go b/kubernetes/typed/apps/v1beta1/statefulset.go index 8b5a7822..2f704613 100644 --- a/kubernetes/typed/apps/v1beta1/statefulset.go +++ b/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/kubernetes/typed/authentication/v1/authentication_client.go b/kubernetes/typed/authentication/v1/authentication_client.go index bd53fc24..51bbfe32 100644 --- a/kubernetes/typed/authentication/v1/authentication_client.go +++ b/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/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go b/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go index 7bd52459..7008c927 100644 --- a/kubernetes/typed/authentication/v1/fake/fake_tokenreview_expansion.go +++ b/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/kubernetes/typed/authentication/v1/tokenreview_expansion.go b/kubernetes/typed/authentication/v1/tokenreview_expansion.go index fb41782f..ea21f1b4 100644 --- a/kubernetes/typed/authentication/v1/tokenreview_expansion.go +++ b/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/kubernetes/typed/authentication/v1beta1/authentication_client.go b/kubernetes/typed/authentication/v1beta1/authentication_client.go index 419dc2cb..f4590553 100644 --- a/kubernetes/typed/authentication/v1beta1/authentication_client.go +++ b/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/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go b/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go index e27e0929..92ef5d1a 100644 --- a/kubernetes/typed/authentication/v1beta1/fake/fake_tokenreview_expansion.go +++ b/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/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go b/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go index 375b6f63..8f186fa7 100644 --- a/kubernetes/typed/authentication/v1beta1/tokenreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/authorization_client.go b/kubernetes/typed/authorization/v1/authorization_client.go index af2924a3..d093f5d9 100644 --- a/kubernetes/typed/authorization/v1/authorization_client.go +++ b/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/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go index e587d203..a01e415c 100644 --- a/kubernetes/typed/authorization/v1/fake/fake_localsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go index e0bbcb1e..91acbe02 100644 --- a/kubernetes/typed/authorization/v1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go index 823d1542..7ddc58ff 100644 --- a/kubernetes/typed/authorization/v1/fake/fake_subjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go index c3b487c7..0c123b07 100644 --- a/kubernetes/typed/authorization/v1/localsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go index 10761508..5b70a27d 100644 --- a/kubernetes/typed/authorization/v1/selfsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go index dfdf6521..b5ed87d3 100644 --- a/kubernetes/typed/authorization/v1/subjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/authorization_client.go b/kubernetes/typed/authorization/v1beta1/authorization_client.go index b49b3b30..7bd0dc58 100644 --- a/kubernetes/typed/authorization/v1beta1/authorization_client.go +++ b/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/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go index 0db666db..5211628f 100644 --- a/kubernetes/typed/authorization/v1beta1/fake/fake_localsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go index d1f77563..6e3af12a 100644 --- a/kubernetes/typed/authorization/v1beta1/fake/fake_selfsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go index 58ced8ec..b0b18b09 100644 --- a/kubernetes/typed/authorization/v1beta1/fake/fake_subjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go index d2ce4f0d..bf1b8a5f 100644 --- a/kubernetes/typed/authorization/v1beta1/localsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go index d341eb14..58fecfd8 100644 --- a/kubernetes/typed/authorization/v1beta1/selfsubjectaccessreview_expansion.go +++ b/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/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go b/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go index 8d03b081..4f93689e 100644 --- a/kubernetes/typed/authorization/v1beta1/subjectaccessreview_expansion.go +++ b/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/kubernetes/typed/autoscaling/v1/autoscaling_client.go b/kubernetes/typed/autoscaling/v1/autoscaling_client.go index b235891c..f1da5ec4 100644 --- a/kubernetes/typed/autoscaling/v1/autoscaling_client.go +++ b/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/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go b/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go index 210b06b8..7f252d14 100644 --- a/kubernetes/typed/autoscaling/v1/fake/fake_horizontalpodautoscaler.go +++ b/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/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go b/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go index f9c790af..c2d890a0 100644 --- a/kubernetes/typed/autoscaling/v1/horizontalpodautoscaler.go +++ b/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/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go b/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go index 0d16aa3e..c6debcb9 100644 --- a/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go +++ b/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/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go b/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go index 1f0389df..1b87fc79 100644 --- a/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go +++ b/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/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go b/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go index c85bfd9f..30cacbf1 100644 --- a/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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/kubernetes/typed/batch/v1/batch_client.go b/kubernetes/typed/batch/v1/batch_client.go index c8766f5b..980dfce7 100644 --- a/kubernetes/typed/batch/v1/batch_client.go +++ b/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/kubernetes/typed/batch/v1/fake/fake_job.go b/kubernetes/typed/batch/v1/fake/fake_job.go index e1305931..f79b4ae4 100644 --- a/kubernetes/typed/batch/v1/fake/fake_job.go +++ b/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/kubernetes/typed/batch/v1/job.go b/kubernetes/typed/batch/v1/job.go index c8120f6d..38392db1 100644 --- a/kubernetes/typed/batch/v1/job.go +++ b/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/kubernetes/typed/batch/v2alpha1/batch_client.go b/kubernetes/typed/batch/v2alpha1/batch_client.go index e2b2dd5c..a6f25c60 100644 --- a/kubernetes/typed/batch/v2alpha1/batch_client.go +++ b/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/kubernetes/typed/batch/v2alpha1/cronjob.go b/kubernetes/typed/batch/v2alpha1/cronjob.go index 2447f2ad..228c3814 100644 --- a/kubernetes/typed/batch/v2alpha1/cronjob.go +++ b/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/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go b/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go index 17f50d63..f1094d29 100644 --- a/kubernetes/typed/batch/v2alpha1/fake/fake_cronjob.go +++ b/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/kubernetes/typed/certificates/v1beta1/certificates_client.go b/kubernetes/typed/certificates/v1beta1/certificates_client.go index c9c39acb..4d74446b 100644 --- a/kubernetes/typed/certificates/v1beta1/certificates_client.go +++ b/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/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go b/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go index 7407ef06..1af1e1f3 100644 --- a/kubernetes/typed/certificates/v1beta1/certificatesigningrequest.go +++ b/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/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go b/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go index 4765bba8..c63b8063 100644 --- a/kubernetes/typed/certificates/v1beta1/certificatesigningrequest_expansion.go +++ b/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/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go b/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go index 9c7c3435..22c6d2d6 100644 --- a/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest.go +++ b/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/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go b/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go index 2333c0f3..8af33e62 100644 --- a/kubernetes/typed/certificates/v1beta1/fake/fake_certificatesigningrequest_expansion.go +++ b/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/kubernetes/typed/core/v1/componentstatus.go b/kubernetes/typed/core/v1/componentstatus.go index 50671976..302bf157 100644 --- a/kubernetes/typed/core/v1/componentstatus.go +++ b/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/kubernetes/typed/core/v1/configmap.go b/kubernetes/typed/core/v1/configmap.go index bb21636e..7dfb01d7 100644 --- a/kubernetes/typed/core/v1/configmap.go +++ b/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/kubernetes/typed/core/v1/core_client.go b/kubernetes/typed/core/v1/core_client.go index 0972960d..d386688e 100644 --- a/kubernetes/typed/core/v1/core_client.go +++ b/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/kubernetes/typed/core/v1/endpoints.go b/kubernetes/typed/core/v1/endpoints.go index 3580742a..5a305d24 100644 --- a/kubernetes/typed/core/v1/endpoints.go +++ b/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/kubernetes/typed/core/v1/event.go b/kubernetes/typed/core/v1/event.go index c4ac1100..414055a5 100644 --- a/kubernetes/typed/core/v1/event.go +++ b/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/kubernetes/typed/core/v1/event_expansion.go b/kubernetes/typed/core/v1/event_expansion.go index 0ad170b3..ea1ed352 100644 --- a/kubernetes/typed/core/v1/event_expansion.go +++ b/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/kubernetes/typed/core/v1/fake/fake_componentstatus.go b/kubernetes/typed/core/v1/fake/fake_componentstatus.go index a1e670de..04fd1a5f 100644 --- a/kubernetes/typed/core/v1/fake/fake_componentstatus.go +++ b/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/kubernetes/typed/core/v1/fake/fake_configmap.go b/kubernetes/typed/core/v1/fake/fake_configmap.go index 801c4412..b7a295df 100644 --- a/kubernetes/typed/core/v1/fake/fake_configmap.go +++ b/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/kubernetes/typed/core/v1/fake/fake_endpoints.go b/kubernetes/typed/core/v1/fake/fake_endpoints.go index f87d2a6e..61a26ee8 100644 --- a/kubernetes/typed/core/v1/fake/fake_endpoints.go +++ b/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/kubernetes/typed/core/v1/fake/fake_event.go b/kubernetes/typed/core/v1/fake/fake_event.go index dba60cd2..27106b9a 100644 --- a/kubernetes/typed/core/v1/fake/fake_event.go +++ b/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/kubernetes/typed/core/v1/fake/fake_event_expansion.go b/kubernetes/typed/core/v1/fake/fake_event_expansion.go index c5291974..e7eb940a 100644 --- a/kubernetes/typed/core/v1/fake/fake_event_expansion.go +++ b/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/kubernetes/typed/core/v1/fake/fake_limitrange.go b/kubernetes/typed/core/v1/fake/fake_limitrange.go index 91de2074..6ab75a8a 100644 --- a/kubernetes/typed/core/v1/fake/fake_limitrange.go +++ b/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/kubernetes/typed/core/v1/fake/fake_namespace.go b/kubernetes/typed/core/v1/fake/fake_namespace.go index 23f62cb5..c8492b90 100644 --- a/kubernetes/typed/core/v1/fake/fake_namespace.go +++ b/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/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go b/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go index 1ac7e75d..a0eae349 100644 --- a/kubernetes/typed/core/v1/fake/fake_namespace_expansion.go +++ b/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/kubernetes/typed/core/v1/fake/fake_node.go b/kubernetes/typed/core/v1/fake/fake_node.go index f4477648..815d866d 100644 --- a/kubernetes/typed/core/v1/fake/fake_node.go +++ b/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/kubernetes/typed/core/v1/fake/fake_node_expansion.go b/kubernetes/typed/core/v1/fake/fake_node_expansion.go index 59733458..eb684fd2 100644 --- a/kubernetes/typed/core/v1/fake/fake_node_expansion.go +++ b/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/kubernetes/typed/core/v1/fake/fake_persistentvolume.go b/kubernetes/typed/core/v1/fake/fake_persistentvolume.go index c4af9f09..90f6a05a 100644 --- a/kubernetes/typed/core/v1/fake/fake_persistentvolume.go +++ b/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/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go b/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go index cb628087..6917f3ad 100644 --- a/kubernetes/typed/core/v1/fake/fake_persistentvolumeclaim.go +++ b/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/kubernetes/typed/core/v1/fake/fake_pod.go b/kubernetes/typed/core/v1/fake/fake_pod.go index 864e8137..ef7f697a 100644 --- a/kubernetes/typed/core/v1/fake/fake_pod.go +++ b/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/kubernetes/typed/core/v1/fake/fake_pod_expansion.go b/kubernetes/typed/core/v1/fake/fake_pod_expansion.go index c9d404e1..497cc785 100644 --- a/kubernetes/typed/core/v1/fake/fake_pod_expansion.go +++ b/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/kubernetes/typed/core/v1/fake/fake_podtemplate.go b/kubernetes/typed/core/v1/fake/fake_podtemplate.go index e6ac59c4..934f3297 100644 --- a/kubernetes/typed/core/v1/fake/fake_podtemplate.go +++ b/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/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go b/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go index 005a28bb..b4f8e332 100644 --- a/kubernetes/typed/core/v1/fake/fake_replicationcontroller.go +++ b/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/kubernetes/typed/core/v1/fake/fake_resourcequota.go b/kubernetes/typed/core/v1/fake/fake_resourcequota.go index 00d63302..5c247e68 100644 --- a/kubernetes/typed/core/v1/fake/fake_resourcequota.go +++ b/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/kubernetes/typed/core/v1/fake/fake_secret.go b/kubernetes/typed/core/v1/fake/fake_secret.go index 375ed033..c16438eb 100644 --- a/kubernetes/typed/core/v1/fake/fake_secret.go +++ b/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/kubernetes/typed/core/v1/fake/fake_service.go b/kubernetes/typed/core/v1/fake/fake_service.go index a755ffdf..b1f8dac4 100644 --- a/kubernetes/typed/core/v1/fake/fake_service.go +++ b/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/kubernetes/typed/core/v1/fake/fake_serviceaccount.go b/kubernetes/typed/core/v1/fake/fake_serviceaccount.go index a3837cbb..43a52286 100644 --- a/kubernetes/typed/core/v1/fake/fake_serviceaccount.go +++ b/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/kubernetes/typed/core/v1/limitrange.go b/kubernetes/typed/core/v1/limitrange.go index 998f0345..c417b081 100644 --- a/kubernetes/typed/core/v1/limitrange.go +++ b/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/kubernetes/typed/core/v1/namespace.go b/kubernetes/typed/core/v1/namespace.go index 3092bd8e..a9c0ef7b 100644 --- a/kubernetes/typed/core/v1/namespace.go +++ b/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/kubernetes/typed/core/v1/namespace_expansion.go b/kubernetes/typed/core/v1/namespace_expansion.go index 20343000..17effe29 100644 --- a/kubernetes/typed/core/v1/namespace_expansion.go +++ b/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/kubernetes/typed/core/v1/node.go b/kubernetes/typed/core/v1/node.go index 6b82d4fa..9765bc77 100644 --- a/kubernetes/typed/core/v1/node.go +++ b/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/kubernetes/typed/core/v1/node_expansion.go b/kubernetes/typed/core/v1/node_expansion.go index 29c12aab..cbaedab9 100644 --- a/kubernetes/typed/core/v1/node_expansion.go +++ b/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/kubernetes/typed/core/v1/persistentvolume.go b/kubernetes/typed/core/v1/persistentvolume.go index 16a4b731..ffb6e8c1 100644 --- a/kubernetes/typed/core/v1/persistentvolume.go +++ b/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/kubernetes/typed/core/v1/persistentvolumeclaim.go b/kubernetes/typed/core/v1/persistentvolumeclaim.go index ae7cc4a4..ea4436be 100644 --- a/kubernetes/typed/core/v1/persistentvolumeclaim.go +++ b/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/kubernetes/typed/core/v1/pod.go b/kubernetes/typed/core/v1/pod.go index 5648750e..4526abfe 100644 --- a/kubernetes/typed/core/v1/pod.go +++ b/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/kubernetes/typed/core/v1/pod_expansion.go b/kubernetes/typed/core/v1/pod_expansion.go index 3919289e..edfb84d1 100644 --- a/kubernetes/typed/core/v1/pod_expansion.go +++ b/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/kubernetes/typed/core/v1/podtemplate.go b/kubernetes/typed/core/v1/podtemplate.go index 19c82f17..769c8b11 100644 --- a/kubernetes/typed/core/v1/podtemplate.go +++ b/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/kubernetes/typed/core/v1/replicationcontroller.go b/kubernetes/typed/core/v1/replicationcontroller.go index 2f4f4fa9..8f0979d1 100644 --- a/kubernetes/typed/core/v1/replicationcontroller.go +++ b/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/kubernetes/typed/core/v1/resourcequota.go b/kubernetes/typed/core/v1/resourcequota.go index 565fe1e6..54b3b1d7 100644 --- a/kubernetes/typed/core/v1/resourcequota.go +++ b/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/kubernetes/typed/core/v1/secret.go b/kubernetes/typed/core/v1/secret.go index fbcede81..ba062174 100644 --- a/kubernetes/typed/core/v1/secret.go +++ b/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/kubernetes/typed/core/v1/service.go b/kubernetes/typed/core/v1/service.go index 0eccf79a..cb10c770 100644 --- a/kubernetes/typed/core/v1/service.go +++ b/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/kubernetes/typed/core/v1/serviceaccount.go b/kubernetes/typed/core/v1/serviceaccount.go index f71789f6..8b7cd6c5 100644 --- a/kubernetes/typed/core/v1/serviceaccount.go +++ b/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/kubernetes/typed/extensions/v1beta1/daemonset.go b/kubernetes/typed/extensions/v1beta1/daemonset.go index 8c132db9..e817eb0c 100644 --- a/kubernetes/typed/extensions/v1beta1/daemonset.go +++ b/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/kubernetes/typed/extensions/v1beta1/deployment.go b/kubernetes/typed/extensions/v1beta1/deployment.go index 7d0122c2..b35ee22a 100644 --- a/kubernetes/typed/extensions/v1beta1/deployment.go +++ b/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/kubernetes/typed/extensions/v1beta1/deployment_expansion.go b/kubernetes/typed/extensions/v1beta1/deployment_expansion.go index e737f09a..24734be6 100644 --- a/kubernetes/typed/extensions/v1beta1/deployment_expansion.go +++ b/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/kubernetes/typed/extensions/v1beta1/extensions_client.go b/kubernetes/typed/extensions/v1beta1/extensions_client.go index 5284346e..691ffd20 100644 --- a/kubernetes/typed/extensions/v1beta1/extensions_client.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go b/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go index c5d14fe4..84e968fb 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_daemonset.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go b/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go index 8be25eee..c0afeb9f 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_deployment.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go b/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go index f49c3366..af2bc0f7 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_deployment_expansion.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go b/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go index d947a376..c18c02a7 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_ingress.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go b/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go index f8b704d2..710a8395 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go b/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go index 3becce4c..a739edc2 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_replicaset.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go b/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go index db13b4c3..d17675f0 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_scale_expansion.go +++ b/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/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go b/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go index 60093cc7..44085fb0 100644 --- a/kubernetes/typed/extensions/v1beta1/fake/fake_thirdpartyresource.go +++ b/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/kubernetes/typed/extensions/v1beta1/ingress.go b/kubernetes/typed/extensions/v1beta1/ingress.go index 86bf65b8..caac300a 100644 --- a/kubernetes/typed/extensions/v1beta1/ingress.go +++ b/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/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go b/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go index ad57a6ca..121718c6 100644 --- a/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go +++ b/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/kubernetes/typed/extensions/v1beta1/replicaset.go b/kubernetes/typed/extensions/v1beta1/replicaset.go index aa6f505a..e7be2b9b 100644 --- a/kubernetes/typed/extensions/v1beta1/replicaset.go +++ b/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/kubernetes/typed/extensions/v1beta1/scale_expansion.go b/kubernetes/typed/extensions/v1beta1/scale_expansion.go index 85d7c40a..d23395a0 100644 --- a/kubernetes/typed/extensions/v1beta1/scale_expansion.go +++ b/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/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go b/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go index 617c2069..5303948b 100644 --- a/kubernetes/typed/extensions/v1beta1/thirdpartyresource.go +++ b/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/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go b/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go index a15f8673..8279ccf1 100644 --- a/kubernetes/typed/networking/v1/fake/fake_networkpolicy.go +++ b/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/kubernetes/typed/networking/v1/networking_client.go b/kubernetes/typed/networking/v1/networking_client.go index 20429dd5..b6fa937b 100644 --- a/kubernetes/typed/networking/v1/networking_client.go +++ b/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/kubernetes/typed/networking/v1/networkpolicy.go b/kubernetes/typed/networking/v1/networkpolicy.go index 14d1e669..30c1dc06 100644 --- a/kubernetes/typed/networking/v1/networkpolicy.go +++ b/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/kubernetes/typed/policy/v1beta1/eviction_expansion.go b/kubernetes/typed/policy/v1beta1/eviction_expansion.go index bde1baca..40bad265 100644 --- a/kubernetes/typed/policy/v1beta1/eviction_expansion.go +++ b/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/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go b/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go index 35c40713..ba857d5e 100644 --- a/kubernetes/typed/policy/v1beta1/fake/fake_eviction_expansion.go +++ b/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/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go b/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go index 0b14cd88..46157455 100644 --- a/kubernetes/typed/policy/v1beta1/fake/fake_poddisruptionbudget.go +++ b/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/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go b/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go index 8088dd01..ba8edc18 100644 --- a/kubernetes/typed/policy/v1beta1/poddisruptionbudget.go +++ b/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/kubernetes/typed/policy/v1beta1/policy_client.go b/kubernetes/typed/policy/v1beta1/policy_client.go index 9d62aad0..f5e72380 100644 --- a/kubernetes/typed/policy/v1beta1/policy_client.go +++ b/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/kubernetes/typed/rbac/v1alpha1/clusterrole.go b/kubernetes/typed/rbac/v1alpha1/clusterrole.go index 24106102..64457e9c 100644 --- a/kubernetes/typed/rbac/v1alpha1/clusterrole.go +++ b/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/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go b/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go index bc48873a..54c7fae5 100644 --- a/kubernetes/typed/rbac/v1alpha1/clusterrolebinding.go +++ b/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/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go b/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go index 47b704b4..4263c304 100644 --- a/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrole.go +++ b/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/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go b/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go index c17a1865..61786f1e 100644 --- a/kubernetes/typed/rbac/v1alpha1/fake/fake_clusterrolebinding.go +++ b/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/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go b/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go index c70b213a..eae1ebb9 100644 --- a/kubernetes/typed/rbac/v1alpha1/fake/fake_role.go +++ b/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/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go b/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go index f4768985..6551f1f1 100644 --- a/kubernetes/typed/rbac/v1alpha1/fake/fake_rolebinding.go +++ b/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/kubernetes/typed/rbac/v1alpha1/rbac_client.go b/kubernetes/typed/rbac/v1alpha1/rbac_client.go index 67256d50..f4155ce8 100644 --- a/kubernetes/typed/rbac/v1alpha1/rbac_client.go +++ b/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/kubernetes/typed/rbac/v1alpha1/role.go b/kubernetes/typed/rbac/v1alpha1/role.go index 9c4fa915..14f8d152 100644 --- a/kubernetes/typed/rbac/v1alpha1/role.go +++ b/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/kubernetes/typed/rbac/v1alpha1/rolebinding.go b/kubernetes/typed/rbac/v1alpha1/rolebinding.go index 5e81967f..9a7c24d4 100644 --- a/kubernetes/typed/rbac/v1alpha1/rolebinding.go +++ b/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/kubernetes/typed/rbac/v1beta1/clusterrole.go b/kubernetes/typed/rbac/v1beta1/clusterrole.go index 6a63571f..85826360 100644 --- a/kubernetes/typed/rbac/v1beta1/clusterrole.go +++ b/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/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go b/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go index a2f38750..0ce46528 100644 --- a/kubernetes/typed/rbac/v1beta1/clusterrolebinding.go +++ b/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/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go b/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go index 43fbd921..23b71e3a 100644 --- a/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrole.go +++ b/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/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go b/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go index e223cc2f..9f3c65ca 100644 --- a/kubernetes/typed/rbac/v1beta1/fake/fake_clusterrolebinding.go +++ b/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/kubernetes/typed/rbac/v1beta1/fake/fake_role.go b/kubernetes/typed/rbac/v1beta1/fake/fake_role.go index 334a7045..bbd36120 100644 --- a/kubernetes/typed/rbac/v1beta1/fake/fake_role.go +++ b/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/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go b/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go index 5a4729b9..ad79389a 100644 --- a/kubernetes/typed/rbac/v1beta1/fake/fake_rolebinding.go +++ b/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/kubernetes/typed/rbac/v1beta1/rbac_client.go b/kubernetes/typed/rbac/v1beta1/rbac_client.go index a24ef4f9..66189af0 100644 --- a/kubernetes/typed/rbac/v1beta1/rbac_client.go +++ b/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/kubernetes/typed/rbac/v1beta1/role.go b/kubernetes/typed/rbac/v1beta1/role.go index aa57ac31..fa3bbd6b 100644 --- a/kubernetes/typed/rbac/v1beta1/role.go +++ b/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/kubernetes/typed/rbac/v1beta1/rolebinding.go b/kubernetes/typed/rbac/v1beta1/rolebinding.go index 3dee9107..0643dafb 100644 --- a/kubernetes/typed/rbac/v1beta1/rolebinding.go +++ b/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/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go b/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go index 8c576cab..75473d9a 100644 --- a/kubernetes/typed/settings/v1alpha1/fake/fake_podpreset.go +++ b/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/kubernetes/typed/settings/v1alpha1/podpreset.go b/kubernetes/typed/settings/v1alpha1/podpreset.go index b8fc0a02..fd5e6100 100644 --- a/kubernetes/typed/settings/v1alpha1/podpreset.go +++ b/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/kubernetes/typed/settings/v1alpha1/settings_client.go b/kubernetes/typed/settings/v1alpha1/settings_client.go index 1a90034b..ec1e30d7 100644 --- a/kubernetes/typed/settings/v1alpha1/settings_client.go +++ b/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/kubernetes/typed/storage/v1/fake/fake_storageclass.go b/kubernetes/typed/storage/v1/fake/fake_storageclass.go index 51ae990c..e3f3c189 100644 --- a/kubernetes/typed/storage/v1/fake/fake_storageclass.go +++ b/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/kubernetes/typed/storage/v1/storage_client.go b/kubernetes/typed/storage/v1/storage_client.go index a95d30b2..2a3b9420 100644 --- a/kubernetes/typed/storage/v1/storage_client.go +++ b/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/kubernetes/typed/storage/v1/storageclass.go b/kubernetes/typed/storage/v1/storageclass.go index 0283c997..f758148a 100644 --- a/kubernetes/typed/storage/v1/storageclass.go +++ b/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/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go b/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go index 895abe56..882e822a 100644 --- a/kubernetes/typed/storage/v1beta1/fake/fake_storageclass.go +++ b/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/kubernetes/typed/storage/v1beta1/storage_client.go b/kubernetes/typed/storage/v1beta1/storage_client.go index 7abb99e5..05d42903 100644 --- a/kubernetes/typed/storage/v1beta1/storage_client.go +++ b/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/kubernetes/typed/storage/v1beta1/storageclass.go b/kubernetes/typed/storage/v1beta1/storageclass.go index 6980fc78..e6634114 100644 --- a/kubernetes/typed/storage/v1beta1/storageclass.go +++ b/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/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go b/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go index c84b35e5..f800b943 100644 --- a/listers/admissionregistration/v1alpha1/externaladmissionhookconfiguration.go +++ b/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/listers/admissionregistration/v1alpha1/initializerconfiguration.go b/listers/admissionregistration/v1alpha1/initializerconfiguration.go index bfe5d467..e32e7d7c 100644 --- a/listers/admissionregistration/v1alpha1/initializerconfiguration.go +++ b/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/listers/apps/v1beta1/controllerrevision.go b/listers/apps/v1beta1/controllerrevision.go index f94ed93e..2690e427 100644 --- a/listers/apps/v1beta1/controllerrevision.go +++ b/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/listers/apps/v1beta1/deployment.go b/listers/apps/v1beta1/deployment.go index 210f7617..5e51aa94 100644 --- a/listers/apps/v1beta1/deployment.go +++ b/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/listers/apps/v1beta1/scale.go b/listers/apps/v1beta1/scale.go index 293a3f66..c8387581 100644 --- a/listers/apps/v1beta1/scale.go +++ b/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/listers/apps/v1beta1/statefulset.go b/listers/apps/v1beta1/statefulset.go index e987dbb1..6aec508b 100644 --- a/listers/apps/v1beta1/statefulset.go +++ b/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/listers/apps/v1beta1/statefulset_expansion.go b/listers/apps/v1beta1/statefulset_expansion.go index b71c13cf..2bb5499b 100644 --- a/listers/apps/v1beta1/statefulset_expansion.go +++ b/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/listers/autoscaling/v1/horizontalpodautoscaler.go b/listers/autoscaling/v1/horizontalpodautoscaler.go index ff340fe2..ef79b7a2 100644 --- a/listers/autoscaling/v1/horizontalpodautoscaler.go +++ b/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/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go b/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go index 77c5203e..44f92d78 100644 --- a/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go +++ b/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/listers/batch/v1/job.go b/listers/batch/v1/job.go index 442c3a9e..7f1fc34e 100644 --- a/listers/batch/v1/job.go +++ b/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/listers/batch/v1/job_expansion.go b/listers/batch/v1/job_expansion.go index 8c285e8d..7359ecb9 100644 --- a/listers/batch/v1/job_expansion.go +++ b/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/listers/batch/v2alpha1/cronjob.go b/listers/batch/v2alpha1/cronjob.go index d45b6139..9a1fbd09 100644 --- a/listers/batch/v2alpha1/cronjob.go +++ b/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/listers/certificates/v1beta1/certificatesigningrequest.go b/listers/certificates/v1beta1/certificatesigningrequest.go index d4d39939..e3717686 100644 --- a/listers/certificates/v1beta1/certificatesigningrequest.go +++ b/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/listers/core/v1/componentstatus.go b/listers/core/v1/componentstatus.go index 1069130c..2bfc7f96 100644 --- a/listers/core/v1/componentstatus.go +++ b/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/listers/core/v1/configmap.go b/listers/core/v1/configmap.go index ff36729e..dac8f9c8 100644 --- a/listers/core/v1/configmap.go +++ b/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/listers/core/v1/endpoints.go b/listers/core/v1/endpoints.go index 483de04b..fb231add 100644 --- a/listers/core/v1/endpoints.go +++ b/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/listers/core/v1/event.go b/listers/core/v1/event.go index 952fb93a..364119b2 100644 --- a/listers/core/v1/event.go +++ b/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/listers/core/v1/limitrange.go b/listers/core/v1/limitrange.go index 05d2c756..cb904142 100644 --- a/listers/core/v1/limitrange.go +++ b/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/listers/core/v1/namespace.go b/listers/core/v1/namespace.go index c5328cf1..6aba4920 100644 --- a/listers/core/v1/namespace.go +++ b/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/listers/core/v1/node.go b/listers/core/v1/node.go index 7bbc4e58..a6c0e522 100644 --- a/listers/core/v1/node.go +++ b/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/listers/core/v1/node_expansion.go b/listers/core/v1/node_expansion.go index 8d446b0d..0b415adb 100644 --- a/listers/core/v1/node_expansion.go +++ b/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/listers/core/v1/persistentvolume.go b/listers/core/v1/persistentvolume.go index e60b1bc2..0bd56577 100644 --- a/listers/core/v1/persistentvolume.go +++ b/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/listers/core/v1/persistentvolumeclaim.go b/listers/core/v1/persistentvolumeclaim.go index b4a77429..066e217d 100644 --- a/listers/core/v1/persistentvolumeclaim.go +++ b/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/listers/core/v1/pod.go b/listers/core/v1/pod.go index 83fe3535..c7069f5c 100644 --- a/listers/core/v1/pod.go +++ b/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/listers/core/v1/podtemplate.go b/listers/core/v1/podtemplate.go index c5a595f3..215ddb60 100644 --- a/listers/core/v1/podtemplate.go +++ b/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/listers/core/v1/replicationcontroller.go b/listers/core/v1/replicationcontroller.go index b25b1dc9..c9d60620 100644 --- a/listers/core/v1/replicationcontroller.go +++ b/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/listers/core/v1/replicationcontroller_expansion.go b/listers/core/v1/replicationcontroller_expansion.go index 33f653b8..4cc45742 100644 --- a/listers/core/v1/replicationcontroller_expansion.go +++ b/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/listers/core/v1/resourcequota.go b/listers/core/v1/resourcequota.go index f09a5b8c..ec77340e 100644 --- a/listers/core/v1/resourcequota.go +++ b/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/listers/core/v1/secret.go b/listers/core/v1/secret.go index 598f700c..cc4325d5 100644 --- a/listers/core/v1/secret.go +++ b/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/listers/core/v1/service.go b/listers/core/v1/service.go index e4048faa..b4e291eb 100644 --- a/listers/core/v1/service.go +++ b/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/listers/core/v1/service_expansion.go b/listers/core/v1/service_expansion.go index 86b7e0c0..5c8c4749 100644 --- a/listers/core/v1/service_expansion.go +++ b/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/listers/core/v1/serviceaccount.go b/listers/core/v1/serviceaccount.go index 0250051b..08ac2684 100644 --- a/listers/core/v1/serviceaccount.go +++ b/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/listers/extensions/v1beta1/daemonset.go b/listers/extensions/v1beta1/daemonset.go index aa763d45..1a84b466 100644 --- a/listers/extensions/v1beta1/daemonset.go +++ b/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/listers/extensions/v1beta1/daemonset_expansion.go b/listers/extensions/v1beta1/daemonset_expansion.go index d2788907..51b91af2 100644 --- a/listers/extensions/v1beta1/daemonset_expansion.go +++ b/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/listers/extensions/v1beta1/deployment.go b/listers/extensions/v1beta1/deployment.go index 4c9a31f8..afaa3f14 100644 --- a/listers/extensions/v1beta1/deployment.go +++ b/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/listers/extensions/v1beta1/deployment_expansion.go b/listers/extensions/v1beta1/deployment_expansion.go index 039c714b..f3a76f96 100644 --- a/listers/extensions/v1beta1/deployment_expansion.go +++ b/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/listers/extensions/v1beta1/ingress.go b/listers/extensions/v1beta1/ingress.go index 9232635e..862fd96d 100644 --- a/listers/extensions/v1beta1/ingress.go +++ b/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/listers/extensions/v1beta1/podsecuritypolicy.go b/listers/extensions/v1beta1/podsecuritypolicy.go index ed136426..fa90ef64 100644 --- a/listers/extensions/v1beta1/podsecuritypolicy.go +++ b/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/listers/extensions/v1beta1/replicaset.go b/listers/extensions/v1beta1/replicaset.go index f07c5e65..19f71df8 100644 --- a/listers/extensions/v1beta1/replicaset.go +++ b/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/listers/extensions/v1beta1/replicaset_expansion.go b/listers/extensions/v1beta1/replicaset_expansion.go index c2e57041..01c25557 100644 --- a/listers/extensions/v1beta1/replicaset_expansion.go +++ b/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/listers/extensions/v1beta1/scale.go b/listers/extensions/v1beta1/scale.go index bfcb2382..08916c6f 100644 --- a/listers/extensions/v1beta1/scale.go +++ b/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/listers/extensions/v1beta1/thirdpartyresource.go b/listers/extensions/v1beta1/thirdpartyresource.go index e1b91fc0..d9abd124 100644 --- a/listers/extensions/v1beta1/thirdpartyresource.go +++ b/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/listers/networking/v1/networkpolicy.go b/listers/networking/v1/networkpolicy.go index 315b34f2..4c1f3485 100644 --- a/listers/networking/v1/networkpolicy.go +++ b/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/listers/policy/v1beta1/eviction.go b/listers/policy/v1beta1/eviction.go index dc9ea3c7..0d7f49d1 100644 --- a/listers/policy/v1beta1/eviction.go +++ b/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/listers/policy/v1beta1/poddisruptionbudget.go b/listers/policy/v1beta1/poddisruptionbudget.go index f3a5677d..374b981d 100644 --- a/listers/policy/v1beta1/poddisruptionbudget.go +++ b/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/listers/policy/v1beta1/poddisruptionbudget_expansion.go b/listers/policy/v1beta1/poddisruptionbudget_expansion.go index 47f38848..01f83774 100644 --- a/listers/policy/v1beta1/poddisruptionbudget_expansion.go +++ b/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/listers/rbac/v1alpha1/clusterrole.go b/listers/rbac/v1alpha1/clusterrole.go index 98c7b9bd..20009978 100644 --- a/listers/rbac/v1alpha1/clusterrole.go +++ b/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/listers/rbac/v1alpha1/clusterrolebinding.go b/listers/rbac/v1alpha1/clusterrolebinding.go index 3016525c..d52eb1a4 100644 --- a/listers/rbac/v1alpha1/clusterrolebinding.go +++ b/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/listers/rbac/v1alpha1/role.go b/listers/rbac/v1alpha1/role.go index 18478e2a..499f615f 100644 --- a/listers/rbac/v1alpha1/role.go +++ b/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/listers/rbac/v1alpha1/rolebinding.go b/listers/rbac/v1alpha1/rolebinding.go index b9b395df..1c8e7a15 100644 --- a/listers/rbac/v1alpha1/rolebinding.go +++ b/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/listers/rbac/v1beta1/clusterrole.go b/listers/rbac/v1beta1/clusterrole.go index f963c740..5f45e278 100644 --- a/listers/rbac/v1beta1/clusterrole.go +++ b/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/listers/rbac/v1beta1/clusterrolebinding.go b/listers/rbac/v1beta1/clusterrolebinding.go index 2826023c..7b3df99a 100644 --- a/listers/rbac/v1beta1/clusterrolebinding.go +++ b/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/listers/rbac/v1beta1/role.go b/listers/rbac/v1beta1/role.go index b1f37a75..c06219c0 100644 --- a/listers/rbac/v1beta1/role.go +++ b/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/listers/rbac/v1beta1/rolebinding.go b/listers/rbac/v1beta1/rolebinding.go index 9f75e097..5d7a8b73 100644 --- a/listers/rbac/v1beta1/rolebinding.go +++ b/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/listers/settings/v1alpha1/podpreset.go b/listers/settings/v1alpha1/podpreset.go index 68c89413..07d6a061 100644 --- a/listers/settings/v1alpha1/podpreset.go +++ b/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/listers/storage/v1/storageclass.go b/listers/storage/v1/storageclass.go index 29dc6f5f..a8c167b8 100644 --- a/listers/storage/v1/storageclass.go +++ b/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/listers/storage/v1beta1/storageclass.go b/listers/storage/v1beta1/storageclass.go index 9d876c4a..69900b86 100644 --- a/listers/storage/v1beta1/storageclass.go +++ b/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/pkg/api/install/install.go b/pkg/api/install/install.go index 1b9553b7..8be66e57 100644 --- a/pkg/api/install/install.go +++ b/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/pkg/api/v1/conversion.go b/pkg/api/v1/conversion.go index 4ded7609..7a64ea39 100644 --- a/pkg/api/v1/conversion.go +++ b/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/pkg/api/v1/node/util.go b/pkg/api/v1/node/util.go index 7fd9d25d..c82ac87e 100644 --- a/pkg/api/v1/node/util.go +++ b/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/pkg/api/v1/ref/ref.go b/pkg/api/v1/ref/ref.go index 51f69555..ebcb9839 100644 --- a/pkg/api/v1/ref/ref.go +++ b/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/pkg/api/v1/resource/helpers.go b/pkg/api/v1/resource/helpers.go index 41e02189..83cc4b2d 100644 --- a/pkg/api/v1/resource/helpers.go +++ b/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/pkg/api/v1/resource/helpers_test.go b/pkg/api/v1/resource/helpers_test.go index 4866bf3c..a11f88fd 100644 --- a/pkg/api/v1/resource/helpers_test.go +++ b/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/pkg/apis/admissionregistration/v1alpha1/generated.pb.go b/pkg/apis/admissionregistration/v1alpha1/generated.pb.go index 58abc1d2..6fe9ea1e 100644 --- a/pkg/apis/admissionregistration/v1alpha1/generated.pb.go +++ b/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/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go b/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go index 34c645df..349e6a9c 100644 --- a/pkg/apis/admissionregistration/v1alpha1/zz_generated.conversion.go +++ b/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/pkg/apis/apps/install/install.go b/pkg/apis/apps/install/install.go index ca50f3ea..e73521aa 100644 --- a/pkg/apis/apps/install/install.go +++ b/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/pkg/apis/apps/register.go b/pkg/apis/apps/register.go index 1098ce0a..a92ad94a 100644 --- a/pkg/apis/apps/register.go +++ b/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/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go index 66badd15..d4e434ba 100644 --- a/pkg/apis/apps/v1beta1/conversion.go +++ b/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/pkg/apis/apps/v1beta1/generated.pb.go b/pkg/apis/apps/v1beta1/generated.pb.go index 9f7395c8..5c971926 100644 --- a/pkg/apis/apps/v1beta1/generated.pb.go +++ b/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/pkg/apis/apps/v1beta1/types.generated.go b/pkg/apis/apps/v1beta1/types.generated.go index a6c0bfb2..a7369697 100644 --- a/pkg/apis/apps/v1beta1/types.generated.go +++ b/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/pkg/apis/apps/v1beta1/types.go b/pkg/apis/apps/v1beta1/types.go index adfd8385..f6870c61 100644 --- a/pkg/apis/apps/v1beta1/types.go +++ b/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/pkg/apis/apps/v1beta1/zz_generated.conversion.go b/pkg/apis/apps/v1beta1/zz_generated.conversion.go index c2c25db8..48af2aa4 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go b/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go index 5be34398..16733805 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.deepcopy.go +++ b/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/pkg/apis/apps/v1beta1/zz_generated.defaults.go b/pkg/apis/apps/v1beta1/zz_generated.defaults.go index 9b822c84..a34f7c53 100644 --- a/pkg/apis/apps/v1beta1/zz_generated.defaults.go +++ b/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/pkg/apis/authentication/install/install.go b/pkg/apis/authentication/install/install.go index b8a9521a..a2630e21 100644 --- a/pkg/apis/authentication/install/install.go +++ b/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/pkg/apis/authentication/v1/generated.pb.go b/pkg/apis/authentication/v1/generated.pb.go index e2648113..d8d90fb8 100644 --- a/pkg/apis/authentication/v1/generated.pb.go +++ b/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/pkg/apis/authentication/v1/zz_generated.conversion.go b/pkg/apis/authentication/v1/zz_generated.conversion.go index 3a4923cc..38bbe16c 100644 --- a/pkg/apis/authentication/v1/zz_generated.conversion.go +++ b/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/pkg/apis/authentication/v1beta1/generated.pb.go b/pkg/apis/authentication/v1beta1/generated.pb.go index 9917cdc6..b2f2373a 100644 --- a/pkg/apis/authentication/v1beta1/generated.pb.go +++ b/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/pkg/apis/authentication/v1beta1/zz_generated.conversion.go b/pkg/apis/authentication/v1beta1/zz_generated.conversion.go index 39a61ae6..e6444842 100644 --- a/pkg/apis/authentication/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/authorization/install/install.go b/pkg/apis/authorization/install/install.go index 33eee661..dff9d3e8 100644 --- a/pkg/apis/authorization/install/install.go +++ b/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/pkg/apis/authorization/v1/generated.pb.go b/pkg/apis/authorization/v1/generated.pb.go index 0204e88d..4486e541 100644 --- a/pkg/apis/authorization/v1/generated.pb.go +++ b/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/pkg/apis/authorization/v1/zz_generated.conversion.go b/pkg/apis/authorization/v1/zz_generated.conversion.go index 97ebf559..2bd72f9e 100644 --- a/pkg/apis/authorization/v1/zz_generated.conversion.go +++ b/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/pkg/apis/authorization/v1beta1/generated.pb.go b/pkg/apis/authorization/v1beta1/generated.pb.go index b2e66e61..bd48fa20 100644 --- a/pkg/apis/authorization/v1beta1/generated.pb.go +++ b/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/pkg/apis/authorization/v1beta1/zz_generated.conversion.go b/pkg/apis/authorization/v1beta1/zz_generated.conversion.go index dc74214f..19cd8511 100644 --- a/pkg/apis/authorization/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/autoscaling/install/install.go b/pkg/apis/autoscaling/install/install.go index 0ecc0af9..f7b7b1fe 100644 --- a/pkg/apis/autoscaling/install/install.go +++ b/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/pkg/apis/autoscaling/v1/conversion.go b/pkg/apis/autoscaling/v1/conversion.go index 3e6a320a..0da8f735 100644 --- a/pkg/apis/autoscaling/v1/conversion.go +++ b/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/pkg/apis/autoscaling/v1/generated.pb.go b/pkg/apis/autoscaling/v1/generated.pb.go index 552c980a..ccd6258b 100644 --- a/pkg/apis/autoscaling/v1/generated.pb.go +++ b/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/pkg/apis/autoscaling/v1/types.generated.go b/pkg/apis/autoscaling/v1/types.generated.go index fc01e4d9..256f5f34 100644 --- a/pkg/apis/autoscaling/v1/types.generated.go +++ b/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/pkg/apis/autoscaling/v1/types.go b/pkg/apis/autoscaling/v1/types.go index 4132f529..c8e6e155 100644 --- a/pkg/apis/autoscaling/v1/types.go +++ b/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/pkg/apis/autoscaling/v1/zz_generated.conversion.go b/pkg/apis/autoscaling/v1/zz_generated.conversion.go index 12c06484..84941924 100644 --- a/pkg/apis/autoscaling/v1/zz_generated.conversion.go +++ b/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/pkg/apis/autoscaling/v2alpha1/defaults.go b/pkg/apis/autoscaling/v2alpha1/defaults.go index 7533cc4a..c353d10f 100644 --- a/pkg/apis/autoscaling/v2alpha1/defaults.go +++ b/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/pkg/apis/autoscaling/v2alpha1/generated.pb.go b/pkg/apis/autoscaling/v2alpha1/generated.pb.go index 47fb3d5f..a077d18f 100644 --- a/pkg/apis/autoscaling/v2alpha1/generated.pb.go +++ b/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/pkg/apis/autoscaling/v2alpha1/types.generated.go b/pkg/apis/autoscaling/v2alpha1/types.generated.go index 5f984e4f..20a1ccf9 100644 --- a/pkg/apis/autoscaling/v2alpha1/types.generated.go +++ b/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/pkg/apis/autoscaling/v2alpha1/types.go b/pkg/apis/autoscaling/v2alpha1/types.go index bbdf7b09..19a83fad 100644 --- a/pkg/apis/autoscaling/v2alpha1/types.go +++ b/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/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go b/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go index 698ff6d1..eeb912da 100644 --- a/pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go +++ b/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/pkg/apis/batch/install/install.go b/pkg/apis/batch/install/install.go index d37f3182..58518226 100644 --- a/pkg/apis/batch/install/install.go +++ b/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/pkg/apis/batch/v1/conversion.go b/pkg/apis/batch/v1/conversion.go index 7f2bc9d1..dda4de7d 100644 --- a/pkg/apis/batch/v1/conversion.go +++ b/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/pkg/apis/batch/v1/generated.pb.go b/pkg/apis/batch/v1/generated.pb.go index bcc6cd9c..434c0869 100644 --- a/pkg/apis/batch/v1/generated.pb.go +++ b/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/pkg/apis/batch/v1/types.generated.go b/pkg/apis/batch/v1/types.generated.go index a7693119..f1f81681 100644 --- a/pkg/apis/batch/v1/types.generated.go +++ b/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/pkg/apis/batch/v1/types.go b/pkg/apis/batch/v1/types.go index bcc8c208..0ed4d404 100644 --- a/pkg/apis/batch/v1/types.go +++ b/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/pkg/apis/batch/v1/zz_generated.conversion.go b/pkg/apis/batch/v1/zz_generated.conversion.go index 3e3e61dc..92d4f380 100644 --- a/pkg/apis/batch/v1/zz_generated.conversion.go +++ b/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/pkg/apis/batch/v1/zz_generated.deepcopy.go b/pkg/apis/batch/v1/zz_generated.deepcopy.go index 22bf9458..3e856dda 100644 --- a/pkg/apis/batch/v1/zz_generated.deepcopy.go +++ b/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/pkg/apis/batch/v1/zz_generated.defaults.go b/pkg/apis/batch/v1/zz_generated.defaults.go index 417024f6..78ba4d9c 100644 --- a/pkg/apis/batch/v1/zz_generated.defaults.go +++ b/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/pkg/apis/batch/v2alpha1/generated.pb.go b/pkg/apis/batch/v2alpha1/generated.pb.go index 28df224b..5ba55a18 100644 --- a/pkg/apis/batch/v2alpha1/generated.pb.go +++ b/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/pkg/apis/batch/v2alpha1/types.generated.go b/pkg/apis/batch/v2alpha1/types.generated.go index 9e72e7d2..ff90dc21 100644 --- a/pkg/apis/batch/v2alpha1/types.generated.go +++ b/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/pkg/apis/batch/v2alpha1/types.go b/pkg/apis/batch/v2alpha1/types.go index d5b3c487..dd0488c1 100644 --- a/pkg/apis/batch/v2alpha1/types.go +++ b/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/pkg/apis/batch/v2alpha1/zz_generated.conversion.go b/pkg/apis/batch/v2alpha1/zz_generated.conversion.go index b422c465..d9a61732 100644 --- a/pkg/apis/batch/v2alpha1/zz_generated.conversion.go +++ b/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/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go b/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go index 9442a216..03ec12f2 100644 --- a/pkg/apis/batch/v2alpha1/zz_generated.deepcopy.go +++ b/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/pkg/apis/batch/v2alpha1/zz_generated.defaults.go b/pkg/apis/batch/v2alpha1/zz_generated.defaults.go index 1c0bd0ee..f1d8b3f9 100644 --- a/pkg/apis/batch/v2alpha1/zz_generated.defaults.go +++ b/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/pkg/apis/certificates/install/install.go b/pkg/apis/certificates/install/install.go index 8850e07a..4095db70 100644 --- a/pkg/apis/certificates/install/install.go +++ b/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/pkg/apis/certificates/v1beta1/generated.pb.go b/pkg/apis/certificates/v1beta1/generated.pb.go index 347df982..97f7da8d 100644 --- a/pkg/apis/certificates/v1beta1/generated.pb.go +++ b/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/pkg/apis/certificates/v1beta1/zz_generated.conversion.go b/pkg/apis/certificates/v1beta1/zz_generated.conversion.go index f1331784..a6adedd1 100644 --- a/pkg/apis/certificates/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/extensions/install/install.go b/pkg/apis/extensions/install/install.go index 1f968e86..30d1104a 100644 --- a/pkg/apis/extensions/install/install.go +++ b/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/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go index cec1e5e4..1a8ce2f3 100644 --- a/pkg/apis/extensions/v1beta1/conversion.go +++ b/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/pkg/apis/extensions/v1beta1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go index a644e5ab..0f9da5e1 100644 --- a/pkg/apis/extensions/v1beta1/defaults.go +++ b/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/pkg/apis/extensions/v1beta1/generated.pb.go b/pkg/apis/extensions/v1beta1/generated.pb.go index 871bd924..03c1d73f 100644 --- a/pkg/apis/extensions/v1beta1/generated.pb.go +++ b/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/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 8d4e39b6..aed651aa 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/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/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index 8f5ad480..5b2d773c 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/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/pkg/apis/extensions/v1beta1/zz_generated.conversion.go b/pkg/apis/extensions/v1beta1/zz_generated.conversion.go index efb81430..4610ccc0 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go b/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go index e6d3c552..4e81dd30 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go +++ b/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/pkg/apis/extensions/v1beta1/zz_generated.defaults.go b/pkg/apis/extensions/v1beta1/zz_generated.defaults.go index 770faa51..be0a5152 100644 --- a/pkg/apis/extensions/v1beta1/zz_generated.defaults.go +++ b/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/pkg/apis/networking/v1/conversion.go b/pkg/apis/networking/v1/conversion.go index 21ec6257..1942068b 100644 --- a/pkg/apis/networking/v1/conversion.go +++ b/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/pkg/apis/networking/v1/defaults.go b/pkg/apis/networking/v1/defaults.go index 7567cf75..0a7b548c 100644 --- a/pkg/apis/networking/v1/defaults.go +++ b/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/pkg/apis/networking/v1/generated.pb.go b/pkg/apis/networking/v1/generated.pb.go index 671557dd..a96372e9 100644 --- a/pkg/apis/networking/v1/generated.pb.go +++ b/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/pkg/apis/networking/v1/types.generated.go b/pkg/apis/networking/v1/types.generated.go index da04aee4..114b58d9 100644 --- a/pkg/apis/networking/v1/types.generated.go +++ b/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/pkg/apis/networking/v1/types.go b/pkg/apis/networking/v1/types.go index a31026a6..a9c5ce95 100644 --- a/pkg/apis/networking/v1/types.go +++ b/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/pkg/apis/networking/v1/zz_generated.conversion.go b/pkg/apis/networking/v1/zz_generated.conversion.go index 500438e9..2ce54a87 100644 --- a/pkg/apis/networking/v1/zz_generated.conversion.go +++ b/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/pkg/apis/networking/v1/zz_generated.deepcopy.go b/pkg/apis/networking/v1/zz_generated.deepcopy.go index 6d9b335d..76a27534 100644 --- a/pkg/apis/networking/v1/zz_generated.deepcopy.go +++ b/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/pkg/apis/policy/install/install.go b/pkg/apis/policy/install/install.go index 6253d5bc..72acf1c2 100644 --- a/pkg/apis/policy/install/install.go +++ b/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/pkg/apis/policy/v1beta1/generated.pb.go b/pkg/apis/policy/v1beta1/generated.pb.go index 0116ded2..b114ca52 100644 --- a/pkg/apis/policy/v1beta1/generated.pb.go +++ b/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/pkg/apis/policy/v1beta1/zz_generated.conversion.go b/pkg/apis/policy/v1beta1/zz_generated.conversion.go index b10663a0..a4f16505 100644 --- a/pkg/apis/policy/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/rbac/install/install.go b/pkg/apis/rbac/install/install.go index f92c11e0..1bce7299 100644 --- a/pkg/apis/rbac/install/install.go +++ b/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/pkg/apis/rbac/v1alpha1/conversion.go b/pkg/apis/rbac/v1alpha1/conversion.go index 22b3c407..d22b128f 100644 --- a/pkg/apis/rbac/v1alpha1/conversion.go +++ b/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/pkg/apis/rbac/v1alpha1/generated.pb.go b/pkg/apis/rbac/v1alpha1/generated.pb.go index 3977142e..11b30f0a 100644 --- a/pkg/apis/rbac/v1alpha1/generated.pb.go +++ b/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/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go b/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go index a3315156..5dfc5707 100644 --- a/pkg/apis/rbac/v1alpha1/zz_generated.conversion.go +++ b/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/pkg/apis/rbac/v1beta1/generated.pb.go b/pkg/apis/rbac/v1beta1/generated.pb.go index 07a71939..86261607 100644 --- a/pkg/apis/rbac/v1beta1/generated.pb.go +++ b/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/pkg/apis/rbac/v1beta1/zz_generated.conversion.go b/pkg/apis/rbac/v1beta1/zz_generated.conversion.go index 56e2c4ee..80331b3e 100644 --- a/pkg/apis/rbac/v1beta1/zz_generated.conversion.go +++ b/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/pkg/apis/settings/install/install.go b/pkg/apis/settings/install/install.go index ccdc7040..76ed2c1b 100644 --- a/pkg/apis/settings/install/install.go +++ b/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/pkg/apis/settings/v1alpha1/generated.pb.go b/pkg/apis/settings/v1alpha1/generated.pb.go index 64b15b1d..cae2b9e2 100644 --- a/pkg/apis/settings/v1alpha1/generated.pb.go +++ b/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/pkg/apis/settings/v1alpha1/types.go b/pkg/apis/settings/v1alpha1/types.go index 0565f7c6..6de2e7db 100644 --- a/pkg/apis/settings/v1alpha1/types.go +++ b/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/pkg/apis/settings/v1alpha1/zz_generated.conversion.go b/pkg/apis/settings/v1alpha1/zz_generated.conversion.go index 45330186..d0d80d27 100644 --- a/pkg/apis/settings/v1alpha1/zz_generated.conversion.go +++ b/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/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go index 4f2e3549..59184d88 100644 --- a/pkg/apis/settings/v1alpha1/zz_generated.deepcopy.go +++ b/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/pkg/apis/settings/v1alpha1/zz_generated.defaults.go b/pkg/apis/settings/v1alpha1/zz_generated.defaults.go index c178a307..9a5b5671 100644 --- a/pkg/apis/settings/v1alpha1/zz_generated.defaults.go +++ b/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/pkg/apis/storage/install/install.go b/pkg/apis/storage/install/install.go index 4608a54e..15fa5929 100644 --- a/pkg/apis/storage/install/install.go +++ b/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/pkg/apis/storage/v1/generated.pb.go b/pkg/apis/storage/v1/generated.pb.go index cc241c5b..fdc96ed4 100644 --- a/pkg/apis/storage/v1/generated.pb.go +++ b/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/pkg/apis/storage/v1/zz_generated.conversion.go b/pkg/apis/storage/v1/zz_generated.conversion.go index aac6bac2..acaba83c 100644 --- a/pkg/apis/storage/v1/zz_generated.conversion.go +++ b/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/pkg/apis/storage/v1beta1/generated.pb.go b/pkg/apis/storage/v1beta1/generated.pb.go index 8f446c0b..5f715881 100644 --- a/pkg/apis/storage/v1beta1/generated.pb.go +++ b/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/pkg/apis/storage/v1beta1/zz_generated.conversion.go b/pkg/apis/storage/v1beta1/zz_generated.conversion.go index 630fff32..166da077 100644 --- a/pkg/apis/storage/v1beta1/zz_generated.conversion.go +++ b/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/rest/client_test.go b/rest/client_test.go index 71707d43..210b2915 100644 --- a/rest/client_test.go +++ b/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/rest/config.go b/rest/config.go index b4511486..5bca6142 100644 --- a/rest/config.go +++ b/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/rest/config_test.go b/rest/config_test.go index 784a1ed8..34033c21 100644 --- a/rest/config_test.go +++ b/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/rest/request.go b/rest/request.go index cfb4511b..b5b635c7 100644 --- a/rest/request.go +++ b/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/rest/request_test.go b/rest/request_test.go index cedac794..fd189b50 100755 --- a/rest/request_test.go +++ b/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/rest/url_utils_test.go b/rest/url_utils_test.go index e53644f7..6321678a 100644 --- a/rest/url_utils_test.go +++ b/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/rest/watch/decoder_test.go b/rest/watch/decoder_test.go index d78da56a..db59fe16 100644 --- a/rest/watch/decoder_test.go +++ b/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/rest/watch/encoder_test.go b/rest/watch/encoder_test.go index b9381b46..3f930141 100644 --- a/rest/watch/encoder_test.go +++ b/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/tools/cache/controller_test.go b/tools/cache/controller_test.go index f8e6cec5..ab96d69f 100644 --- a/tools/cache/controller_test.go +++ b/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/tools/cache/index_test.go b/tools/cache/index_test.go index 418dca44..7a44763c 100644 --- a/tools/cache/index_test.go +++ b/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/tools/cache/mutation_detector_test.go b/tools/cache/mutation_detector_test.go index b2fe5fb9..a1f8f11a 100644 --- a/tools/cache/mutation_detector_test.go +++ b/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/tools/cache/reflector_test.go b/tools/cache/reflector_test.go index ae2b75fa..3f64c78f 100644 --- a/tools/cache/reflector_test.go +++ b/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/tools/cache/shared_informer_test.go b/tools/cache/shared_informer_test.go index 216ba923..6f4772a8 100644 --- a/tools/cache/shared_informer_test.go +++ b/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/tools/cache/testing/fake_controller_source.go b/tools/cache/testing/fake_controller_source.go index fd06fc89..ab8b8f9e 100644 --- a/tools/cache/testing/fake_controller_source.go +++ b/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/tools/cache/testing/fake_controller_source_test.go b/tools/cache/testing/fake_controller_source_test.go index 2a03171c..0186e370 100644 --- a/tools/cache/testing/fake_controller_source_test.go +++ b/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/tools/clientcmd/client_config.go b/tools/clientcmd/client_config.go index 103648f1..a8698af2 100644 --- a/tools/clientcmd/client_config.go +++ b/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/tools/clientcmd/merged_client_builder.go b/tools/clientcmd/merged_client_builder.go index 32ffd197..3f02111b 100644 --- a/tools/clientcmd/merged_client_builder.go +++ b/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/tools/portforward/portforward.go b/tools/portforward/portforward.go index 2071b25a..4944ed8b 100644 --- a/tools/portforward/portforward.go +++ b/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/tools/record/event.go b/tools/record/event.go index 6b2fad40..f1390daa 100644 --- a/tools/record/event.go +++ b/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/tools/record/event_test.go b/tools/record/event_test.go index bc09f68f..a239f3f1 100644 --- a/tools/record/event_test.go +++ b/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/tools/record/events_cache.go b/tools/record/events_cache.go index bde110bf..37432ae6 100644 --- a/tools/record/events_cache.go +++ b/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/tools/record/events_cache_test.go b/tools/record/events_cache_test.go index 2fdba3b8..39e8f7e0 100644 --- a/tools/record/events_cache_test.go +++ b/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/tools/remotecommand/v1.go b/tools/remotecommand/v1.go index 1db917c0..db01a9d9 100644 --- a/tools/remotecommand/v1.go +++ b/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/tools/remotecommand/v2.go b/tools/remotecommand/v2.go index 95346a43..ad2a8add 100644 --- a/tools/remotecommand/v2.go +++ b/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/tools/remotecommand/v2_test.go b/tools/remotecommand/v2_test.go index adebfaed..f8a46a15 100644 --- a/tools/remotecommand/v2_test.go +++ b/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/tools/remotecommand/v3.go b/tools/remotecommand/v3.go index 03b9e2a6..22317322 100644 --- a/tools/remotecommand/v3.go +++ b/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