From 140c62cd4cfd129d95ac96355d0bc59278317cca Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Tue, 25 Jun 2019 22:16:36 -0700 Subject: [PATCH] Update all imports to scheme in staging --- .../ttlafterfinished/ttlafterfinished_controller.go | 2 +- pkg/kubectl/cmd/annotate/annotate.go | 2 +- pkg/kubectl/cmd/annotate/annotate_test.go | 2 +- pkg/kubectl/cmd/apply/apply.go | 2 +- pkg/kubectl/cmd/apply/apply_set_last_applied.go | 2 +- pkg/kubectl/cmd/apply/apply_test.go | 2 +- pkg/kubectl/cmd/attach/attach.go | 2 +- pkg/kubectl/cmd/attach/attach_test.go | 2 +- pkg/kubectl/cmd/auth/cani_test.go | 2 +- pkg/kubectl/cmd/auth/reconcile.go | 2 +- pkg/kubectl/cmd/autoscale/autoscale.go | 2 +- pkg/kubectl/cmd/certificates/certificates.go | 2 +- pkg/kubectl/cmd/clusterinfo/clusterinfo.go | 2 +- pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go | 2 +- pkg/kubectl/cmd/config/view.go | 2 +- pkg/kubectl/cmd/cp/cp_test.go | 2 +- pkg/kubectl/cmd/create/create.go | 2 +- pkg/kubectl/cmd/create/create_clusterrole_test.go | 2 +- pkg/kubectl/cmd/create/create_clusterrolebinding_test.go | 2 +- pkg/kubectl/cmd/create/create_configmap_test.go | 2 +- pkg/kubectl/cmd/create/create_cronjob.go | 2 +- pkg/kubectl/cmd/create/create_deployment_test.go | 2 +- pkg/kubectl/cmd/create/create_job.go | 2 +- pkg/kubectl/cmd/create/create_namespace_test.go | 2 +- pkg/kubectl/cmd/create/create_pdb_test.go | 2 +- pkg/kubectl/cmd/create/create_priorityclass_test.go | 2 +- pkg/kubectl/cmd/create/create_role.go | 2 +- pkg/kubectl/cmd/create/create_role_test.go | 2 +- pkg/kubectl/cmd/create/create_rolebinding_test.go | 2 +- pkg/kubectl/cmd/create/create_secret_test.go | 2 +- pkg/kubectl/cmd/create/create_service_test.go | 2 +- pkg/kubectl/cmd/create/create_serviceaccount_test.go | 2 +- pkg/kubectl/cmd/create/create_test.go | 2 +- pkg/kubectl/cmd/delete/delete_test.go | 2 +- pkg/kubectl/cmd/describe/describe_test.go | 2 +- pkg/kubectl/cmd/diff/diff.go | 2 +- pkg/kubectl/cmd/drain/drain.go | 2 +- pkg/kubectl/cmd/drain/drain_test.go | 2 +- pkg/kubectl/cmd/exec/exec.go | 2 +- pkg/kubectl/cmd/exec/exec_test.go | 2 +- pkg/kubectl/cmd/expose/expose.go | 2 +- pkg/kubectl/cmd/expose/expose_test.go | 2 +- pkg/kubectl/cmd/get/customcolumn_flags.go | 2 +- pkg/kubectl/cmd/get/customcolumn_test.go | 2 +- pkg/kubectl/cmd/get/get_test.go | 2 +- pkg/kubectl/cmd/get/sorter_test.go | 2 +- pkg/kubectl/cmd/label/label.go | 2 +- pkg/kubectl/cmd/label/label_test.go | 2 +- pkg/kubectl/cmd/logs/logs.go | 2 +- pkg/kubectl/cmd/patch/patch.go | 2 +- pkg/kubectl/cmd/patch/patch_test.go | 2 +- pkg/kubectl/cmd/portforward/portforward_test.go | 2 +- pkg/kubectl/cmd/replace/replace.go | 2 +- pkg/kubectl/cmd/replace/replace_test.go | 2 +- pkg/kubectl/cmd/rollingupdate/rollingupdate.go | 2 +- pkg/kubectl/cmd/rollout/rollout_history.go | 2 +- pkg/kubectl/cmd/rollout/rollout_pause.go | 2 +- pkg/kubectl/cmd/rollout/rollout_pause_test.go | 2 +- pkg/kubectl/cmd/rollout/rollout_restart.go | 2 +- pkg/kubectl/cmd/rollout/rollout_resume.go | 2 +- pkg/kubectl/cmd/rollout/rollout_status.go | 2 +- pkg/kubectl/cmd/rollout/rollout_undo.go | 2 +- pkg/kubectl/cmd/run/run.go | 2 +- pkg/kubectl/cmd/run/run_test.go | 2 +- pkg/kubectl/cmd/set/set_env.go | 2 +- pkg/kubectl/cmd/set/set_env_test.go | 2 +- pkg/kubectl/cmd/set/set_image.go | 2 +- pkg/kubectl/cmd/set/set_image_test.go | 2 +- pkg/kubectl/cmd/set/set_resources.go | 2 +- pkg/kubectl/cmd/set/set_resources_test.go | 2 +- pkg/kubectl/cmd/set/set_selector.go | 2 +- pkg/kubectl/cmd/set/set_serviceaccount.go | 2 +- pkg/kubectl/cmd/set/set_serviceaccount_test.go | 2 +- pkg/kubectl/cmd/set/set_subject.go | 2 +- pkg/kubectl/cmd/taint/taint.go | 2 +- pkg/kubectl/cmd/taint/taint_test.go | 2 +- pkg/kubectl/cmd/testing/fake.go | 3 ++- pkg/kubectl/cmd/testing/util.go | 2 +- pkg/kubectl/cmd/top/top_node_test.go | 2 +- pkg/kubectl/cmd/top/top_pod_test.go | 2 +- pkg/kubectl/cmd/util/editor/editoptions.go | 2 +- pkg/kubectl/cmd/util/helpers_test.go | 2 +- pkg/kubectl/cmd/util/kubectl_match_version.go | 2 +- pkg/kubectl/describe/versioned/describe.go | 8 +++++++- pkg/kubectl/explain/explain_test.go | 2 +- pkg/kubectl/polymorphichelpers/objectpauser.go | 2 +- pkg/kubectl/polymorphichelpers/objectrestarter.go | 2 +- pkg/kubectl/polymorphichelpers/objectresumer.go | 2 +- pkg/kubectl/rollback.go | 2 +- pkg/kubectl/rolling_updater_test.go | 2 +- pkg/kubectl/rollout_status.go | 2 +- pkg/kubectl/rollout_status_test.go | 2 +- 92 files changed, 99 insertions(+), 92 deletions(-) diff --git a/pkg/controller/ttlafterfinished/ttlafterfinished_controller.go b/pkg/controller/ttlafterfinished/ttlafterfinished_controller.go index 930d2df7d1f..fd4c8ca2a6a 100644 --- a/pkg/controller/ttlafterfinished/ttlafterfinished_controller.go +++ b/pkg/controller/ttlafterfinished/ttlafterfinished_controller.go @@ -38,7 +38,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/kubernetes/pkg/controller" jobutil "k8s.io/kubernetes/pkg/controller/job" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/util/metrics" ) diff --git a/pkg/kubectl/cmd/annotate/annotate.go b/pkg/kubectl/cmd/annotate/annotate.go index 20434b0ea37..5d28083c703 100644 --- a/pkg/kubectl/cmd/annotate/annotate.go +++ b/pkg/kubectl/cmd/annotate/annotate.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/annotate/annotate_test.go b/pkg/kubectl/cmd/annotate/annotate_test.go index 33e45ad9b6c..6e1f16d4a7e 100644 --- a/pkg/kubectl/cmd/annotate/annotate_test.go +++ b/pkg/kubectl/cmd/annotate/annotate_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go index 99e4bf57c62..bd65e654698 100644 --- a/pkg/kubectl/cmd/apply/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -52,7 +52,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/apply/apply_set_last_applied.go b/pkg/kubectl/cmd/apply/apply_set_last_applied.go index c134aea22f8..b1fc28e8b5d 100644 --- a/pkg/kubectl/cmd/apply/apply_set_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_set_last_applied.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/apply/apply_test.go b/pkg/kubectl/cmd/apply/apply_test.go index 18e11835b7d..15dad464c28 100644 --- a/pkg/kubectl/cmd/apply/apply_test.go +++ b/pkg/kubectl/cmd/apply/apply_test.go @@ -49,7 +49,7 @@ import ( cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/cmd/attach/attach.go b/pkg/kubectl/cmd/attach/attach.go index 1d0efbb86c2..1b2d9b107d9 100644 --- a/pkg/kubectl/cmd/attach/attach.go +++ b/pkg/kubectl/cmd/attach/attach.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/exec" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/attach/attach_test.go b/pkg/kubectl/cmd/attach/attach_test.go index cd5a061a400..c7dcaeba02f 100644 --- a/pkg/kubectl/cmd/attach/attach_test.go +++ b/pkg/kubectl/cmd/attach/attach_test.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/exec" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) type fakeRemoteAttach struct { diff --git a/pkg/kubectl/cmd/auth/cani_test.go b/pkg/kubectl/cmd/auth/cani_test.go index b553356b452..3cac4e1b281 100644 --- a/pkg/kubectl/cmd/auth/cani_test.go +++ b/pkg/kubectl/cmd/auth/cani_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestRunAccessCheck(t *testing.T) { diff --git a/pkg/kubectl/cmd/auth/reconcile.go b/pkg/kubectl/cmd/auth/reconcile.go index 1d0f43e9f95..84b99d1f901 100644 --- a/pkg/kubectl/cmd/auth/reconcile.go +++ b/pkg/kubectl/cmd/auth/reconcile.go @@ -34,7 +34,7 @@ import ( rbacv1client "k8s.io/client-go/kubernetes/typed/rbac/v1" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/registry/rbac/reconciliation" ) diff --git a/pkg/kubectl/cmd/autoscale/autoscale.go b/pkg/kubectl/cmd/autoscale/autoscale.go index 852a044b038..00b1356e208 100644 --- a/pkg/kubectl/cmd/autoscale/autoscale.go +++ b/pkg/kubectl/cmd/autoscale/autoscale.go @@ -34,7 +34,7 @@ import ( cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/certificates/certificates.go b/pkg/kubectl/cmd/certificates/certificates.go index b5bbeed2102..119d6425420 100644 --- a/pkg/kubectl/cmd/certificates/certificates.go +++ b/pkg/kubectl/cmd/certificates/certificates.go @@ -32,7 +32,7 @@ import ( certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go index 1a01d2a34b9..8fa56f96c63 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go @@ -29,7 +29,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ct "github.com/daviddengcn/go-colortext" diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go index b5e7cdc697f..b726d46c12b 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index 43a35e02ba3..f9b5bfaaafe 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -29,7 +29,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/cp/cp_test.go b/pkg/kubectl/cmd/cp/cp_test.go index 8ae0d265879..41ed342169c 100644 --- a/pkg/kubectl/cmd/cp/cp_test.go +++ b/pkg/kubectl/cmd/cp/cp_test.go @@ -40,7 +40,7 @@ import ( "k8s.io/client-go/rest/fake" kexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) type FileType int diff --git a/pkg/kubectl/cmd/create/create.go b/pkg/kubectl/cmd/create/create.go index 688938d77f5..dc294d139dd 100644 --- a/pkg/kubectl/cmd/create/create.go +++ b/pkg/kubectl/cmd/create/create.go @@ -41,7 +41,7 @@ import ( cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" "k8s.io/kubernetes/pkg/kubectl/generate" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/create/create_clusterrole_test.go b/pkg/kubectl/cmd/create/create_clusterrole_test.go index c78470d9cb7..eba24e37cab 100644 --- a/pkg/kubectl/cmd/create/create_clusterrole_test.go +++ b/pkg/kubectl/cmd/create/create_clusterrole_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRole(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding_test.go b/pkg/kubectl/cmd/create/create_clusterrolebinding_test.go index 89cdb34ccad..dcceef0ad69 100644 --- a/pkg/kubectl/cmd/create/create_clusterrolebinding_test.go +++ b/pkg/kubectl/cmd/create/create_clusterrolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRoleBinding(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_configmap_test.go b/pkg/kubectl/cmd/create/create_configmap_test.go index 8b860047813..58cd93f625a 100644 --- a/pkg/kubectl/cmd/create/create_configmap_test.go +++ b/pkg/kubectl/cmd/create/create_configmap_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateConfigMap(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_cronjob.go b/pkg/kubectl/cmd/create/create_cronjob.go index e3fd5b90485..d0023f85d8f 100644 --- a/pkg/kubectl/cmd/create/create_cronjob.go +++ b/pkg/kubectl/cmd/create/create_cronjob.go @@ -31,7 +31,7 @@ import ( batchv1beta1client "k8s.io/client-go/kubernetes/typed/batch/v1beta1" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var ( diff --git a/pkg/kubectl/cmd/create/create_deployment_test.go b/pkg/kubectl/cmd/create/create_deployment_test.go index 0284dc3508a..c64976963f6 100644 --- a/pkg/kubectl/cmd/create/create_deployment_test.go +++ b/pkg/kubectl/cmd/create/create_deployment_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func Test_generatorFromName(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_job.go b/pkg/kubectl/cmd/create/create_job.go index baea2423f45..872fa9c6653 100644 --- a/pkg/kubectl/cmd/create/create_job.go +++ b/pkg/kubectl/cmd/create/create_job.go @@ -32,7 +32,7 @@ import ( batchv1client "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/create/create_namespace_test.go b/pkg/kubectl/cmd/create/create_namespace_test.go index 86f57c71505..c76df097e21 100644 --- a/pkg/kubectl/cmd/create/create_namespace_test.go +++ b/pkg/kubectl/cmd/create/create_namespace_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateNamespace(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_pdb_test.go b/pkg/kubectl/cmd/create/create_pdb_test.go index 56319478276..40fa1f00a81 100644 --- a/pkg/kubectl/cmd/create/create_pdb_test.go +++ b/pkg/kubectl/cmd/create/create_pdb_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePdb(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_priorityclass_test.go b/pkg/kubectl/cmd/create/create_priorityclass_test.go index 3fdf7197565..12ebcafe2ad 100644 --- a/pkg/kubectl/cmd/create/create_priorityclass_test.go +++ b/pkg/kubectl/cmd/create/create_priorityclass_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePriorityClass(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_role.go b/pkg/kubectl/cmd/create/create_role.go index 8cf52e300b8..30031962be6 100644 --- a/pkg/kubectl/cmd/create/create_role.go +++ b/pkg/kubectl/cmd/create/create_role.go @@ -32,7 +32,7 @@ import ( clientgorbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/create/create_role_test.go b/pkg/kubectl/cmd/create/create_role_test.go index 82a52b525db..8ce49bc3ea6 100644 --- a/pkg/kubectl/cmd/create/create_role_test.go +++ b/pkg/kubectl/cmd/create/create_role_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateRole(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_rolebinding_test.go b/pkg/kubectl/cmd/create/create_rolebinding_test.go index cd70a729171..7d0bb7f0d16 100644 --- a/pkg/kubectl/cmd/create/create_rolebinding_test.go +++ b/pkg/kubectl/cmd/create/create_rolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} diff --git a/pkg/kubectl/cmd/create/create_secret_test.go b/pkg/kubectl/cmd/create/create_secret_test.go index cf7ba616188..8f3f955869d 100644 --- a/pkg/kubectl/cmd/create/create_secret_test.go +++ b/pkg/kubectl/cmd/create/create_secret_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateSecretGeneric(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_service_test.go b/pkg/kubectl/cmd/create/create_service_test.go index 8337b8d63ea..3d0be858bf6 100644 --- a/pkg/kubectl/cmd/create/create_service_test.go +++ b/pkg/kubectl/cmd/create/create_service_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateService(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_serviceaccount_test.go b/pkg/kubectl/cmd/create/create_serviceaccount_test.go index 98a3ef8c41f..bd905876816 100644 --- a/pkg/kubectl/cmd/create/create_serviceaccount_test.go +++ b/pkg/kubectl/cmd/create/create_serviceaccount_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_test.go b/pkg/kubectl/cmd/create/create_test.go index ef60e50c0fb..e3cb7aeb422 100644 --- a/pkg/kubectl/cmd/create/create_test.go +++ b/pkg/kubectl/cmd/create/create_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestExtraArgsFail(t *testing.T) { diff --git a/pkg/kubectl/cmd/delete/delete_test.go b/pkg/kubectl/cmd/delete/delete_test.go index 01f85c220ac..032c1c50b91 100644 --- a/pkg/kubectl/cmd/delete/delete_test.go +++ b/pkg/kubectl/cmd/delete/delete_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func fakecmd() *cobra.Command { diff --git a/pkg/kubectl/cmd/describe/describe_test.go b/pkg/kubectl/cmd/describe/describe_test.go index 80abe484103..a29f49722b0 100644 --- a/pkg/kubectl/cmd/describe/describe_test.go +++ b/pkg/kubectl/cmd/describe/describe_test.go @@ -29,7 +29,7 @@ import ( cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" "k8s.io/kubernetes/pkg/kubectl/describe" versioneddescribe "k8s.io/kubernetes/pkg/kubectl/describe/versioned" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/pkg/kubectl/cmd/diff/diff.go b/pkg/kubectl/cmd/diff/diff.go index ea80a8e23af..03eb82a36db 100644 --- a/pkg/kubectl/cmd/diff/diff.go +++ b/pkg/kubectl/cmd/diff/diff.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/apply" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" "k8s.io/utils/exec" "sigs.k8s.io/yaml" diff --git a/pkg/kubectl/cmd/drain/drain.go b/pkg/kubectl/cmd/drain/drain.go index 6cc1679f2d7..9f8a7f24710 100644 --- a/pkg/kubectl/cmd/drain/drain.go +++ b/pkg/kubectl/cmd/drain/drain.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/drain" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/drain/drain_test.go b/pkg/kubectl/cmd/drain/drain_test.go index bd25d2a9579..f005e905bcc 100644 --- a/pkg/kubectl/cmd/drain/drain_test.go +++ b/pkg/kubectl/cmd/drain/drain_test.go @@ -50,7 +50,7 @@ import ( cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/drain" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/cmd/exec/exec.go b/pkg/kubectl/cmd/exec/exec.go index f355efe93ec..6e3b2696a36 100644 --- a/pkg/kubectl/cmd/exec/exec.go +++ b/pkg/kubectl/cmd/exec/exec.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/util/term" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/exec/exec_test.go b/pkg/kubectl/cmd/exec/exec_test.go index cdcdb6f11c9..423fa0b3b95 100644 --- a/pkg/kubectl/cmd/exec/exec_test.go +++ b/pkg/kubectl/cmd/exec/exec_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/util/term" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) type fakeRemoteExecutor struct { diff --git a/pkg/kubectl/cmd/expose/expose.go b/pkg/kubectl/cmd/expose/expose.go index 8898f4b3c88..d09966631d1 100644 --- a/pkg/kubectl/cmd/expose/expose.go +++ b/pkg/kubectl/cmd/expose/expose.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/expose/expose_test.go b/pkg/kubectl/cmd/expose/expose_test.go index c57a8449476..b26a3dc0f87 100644 --- a/pkg/kubectl/cmd/expose/expose_test.go +++ b/pkg/kubectl/cmd/expose/expose_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestRunExposeService(t *testing.T) { diff --git a/pkg/kubectl/cmd/get/customcolumn_flags.go b/pkg/kubectl/cmd/get/customcolumn_flags.go index 832b0519462..eee919b49b3 100644 --- a/pkg/kubectl/cmd/get/customcolumn_flags.go +++ b/pkg/kubectl/cmd/get/customcolumn_flags.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var columnsFormats = map[string]bool{ diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/pkg/kubectl/cmd/get/customcolumn_test.go index c8a8ed756f5..e783ea4bf22 100644 --- a/pkg/kubectl/cmd/get/customcolumn_test.go +++ b/pkg/kubectl/cmd/get/customcolumn_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/kubectl/pkg/util/printers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) // UniversalDecoder call must specify parameter versions; otherwise it will decode to internal versions. diff --git a/pkg/kubectl/cmd/get/get_test.go b/pkg/kubectl/cmd/get/get_test.go index c2b5d0bec99..9bfe879f6f1 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/pkg/kubectl/cmd/get/get_test.go @@ -50,7 +50,7 @@ import ( cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var ( diff --git a/pkg/kubectl/cmd/get/sorter_test.go b/pkg/kubectl/cmd/get/sorter_test.go index be2abd57f9b..67098c608bc 100644 --- a/pkg/kubectl/cmd/get/sorter_test.go +++ b/pkg/kubectl/cmd/get/sorter_test.go @@ -29,7 +29,7 @@ import ( metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/diff" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func toUnstructuredOrDie(data []byte) *unstructured.Unstructured { diff --git a/pkg/kubectl/cmd/label/label.go b/pkg/kubectl/cmd/label/label.go index ccb34f0ef3b..2629247f4fc 100644 --- a/pkg/kubectl/cmd/label/label.go +++ b/pkg/kubectl/cmd/label/label.go @@ -39,7 +39,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/label/label_test.go b/pkg/kubectl/cmd/label/label_test.go index 871a4e16504..0bd9e8475a4 100644 --- a/pkg/kubectl/cmd/label/label_test.go +++ b/pkg/kubectl/cmd/label/label_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateLabels(t *testing.T) { diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index 6a2f9c6631c..842011148ae 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -35,7 +35,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/patch/patch.go b/pkg/kubectl/cmd/patch/patch.go index 0a3f4497044..1fc3b2cddac 100644 --- a/pkg/kubectl/cmd/patch/patch.go +++ b/pkg/kubectl/cmd/patch/patch.go @@ -38,7 +38,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/patch/patch_test.go b/pkg/kubectl/cmd/patch/patch_test.go index 305902ab2d0..e82979d7e95 100644 --- a/pkg/kubectl/cmd/patch/patch_test.go +++ b/pkg/kubectl/cmd/patch/patch_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestPatchObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/portforward/portforward_test.go b/pkg/kubectl/cmd/portforward/portforward_test.go index 18afc37f552..001108d88c2 100644 --- a/pkg/kubectl/cmd/portforward/portforward_test.go +++ b/pkg/kubectl/cmd/portforward/portforward_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) type fakePortForwarder struct { diff --git a/pkg/kubectl/cmd/replace/replace.go b/pkg/kubectl/cmd/replace/replace.go index dedf1fbe903..ac3bc0ecfff 100644 --- a/pkg/kubectl/cmd/replace/replace.go +++ b/pkg/kubectl/cmd/replace/replace.go @@ -40,7 +40,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/replace/replace_test.go b/pkg/kubectl/cmd/replace/replace_test.go index dd6e0880d4a..f4432c73fd8 100644 --- a/pkg/kubectl/cmd/replace/replace_test.go +++ b/pkg/kubectl/cmd/replace/replace_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestReplaceObject(t *testing.T) { diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go index d7926475b6a..2780b450595 100644 --- a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index 3c6bf0688d8..6c848720573 100644 --- a/pkg/kubectl/cmd/rollout/rollout_history.go +++ b/pkg/kubectl/cmd/rollout/rollout_history.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index 2bf76cd41a5..a5c4ad258a3 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_pause_test.go b/pkg/kubectl/cmd/rollout/rollout_pause_test.go index 0be44f3df95..5220b0df599 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause_test.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} diff --git a/pkg/kubectl/cmd/rollout/rollout_restart.go b/pkg/kubectl/cmd/rollout/rollout_restart.go index fd754cc08f4..c462714461f 100644 --- a/pkg/kubectl/cmd/rollout/rollout_restart.go +++ b/pkg/kubectl/cmd/rollout/rollout_restart.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index 2d03f3c35b7..a6f60297406 100644 --- a/pkg/kubectl/cmd/rollout/rollout_resume.go +++ b/pkg/kubectl/cmd/rollout/rollout_resume.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_status.go b/pkg/kubectl/cmd/rollout/rollout_status.go index 1d8b8b7d6e7..a72f054f847 100644 --- a/pkg/kubectl/cmd/rollout/rollout_status.go +++ b/pkg/kubectl/cmd/rollout/rollout_status.go @@ -40,7 +40,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index 26f6531a9c6..f93bc620dce 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -27,7 +27,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/run/run.go b/pkg/kubectl/cmd/run/run.go index a361788778f..b6c4af5338d 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -51,7 +51,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" uexec "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/run/run_test.go b/pkg/kubectl/cmd/run/run_test.go index 6c2278cf72b..8336c8697b9 100644 --- a/pkg/kubectl/cmd/run/run_test.go +++ b/pkg/kubectl/cmd/run/run_test.go @@ -39,7 +39,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/set/set_env.go b/pkg/kubectl/cmd/set/set_env.go index 0ef33f302c0..9649997d418 100644 --- a/pkg/kubectl/cmd/set/set_env.go +++ b/pkg/kubectl/cmd/set/set_env.go @@ -38,7 +38,7 @@ import ( envutil "k8s.io/kubernetes/pkg/kubectl/cmd/set/env" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var ( diff --git a/pkg/kubectl/cmd/set/set_env_test.go b/pkg/kubectl/cmd/set/set_env_test.go index 4ece4807df4..8d825e70000 100644 --- a/pkg/kubectl/cmd/set/set_env_test.go +++ b/pkg/kubectl/cmd/set/set_env_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestSetEnvLocal(t *testing.T) { diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index 85336ae34d7..9a2c9c7e043 100644 --- a/pkg/kubectl/cmd/set/set_image.go +++ b/pkg/kubectl/cmd/set/set_image.go @@ -32,7 +32,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/set/set_image_test.go b/pkg/kubectl/cmd/set/set_image_test.go index 5bf98c511eb..5a4397076aa 100644 --- a/pkg/kubectl/cmd/set/set_image_test.go +++ b/pkg/kubectl/cmd/set/set_image_test.go @@ -39,7 +39,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestImageLocal(t *testing.T) { diff --git a/pkg/kubectl/cmd/set/set_resources.go b/pkg/kubectl/cmd/set/set_resources.go index 1f6c5d7d67a..25e039e9fc3 100644 --- a/pkg/kubectl/cmd/set/set_resources.go +++ b/pkg/kubectl/cmd/set/set_resources.go @@ -33,7 +33,7 @@ import ( cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/set/set_resources_test.go b/pkg/kubectl/cmd/set/set_resources_test.go index 5b50c953b1a..f4c9f942564 100644 --- a/pkg/kubectl/cmd/set/set_resources_test.go +++ b/pkg/kubectl/cmd/set/set_resources_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestResourcesLocal(t *testing.T) { diff --git a/pkg/kubectl/cmd/set/set_selector.go b/pkg/kubectl/cmd/set/set_selector.go index 3091e7cd43b..6d6e7e1b2be 100644 --- a/pkg/kubectl/cmd/set/set_selector.go +++ b/pkg/kubectl/cmd/set/set_selector.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/set/set_serviceaccount.go b/pkg/kubectl/cmd/set/set_serviceaccount.go index ec12de71263..345f8602ba0 100644 --- a/pkg/kubectl/cmd/set/set_serviceaccount.go +++ b/pkg/kubectl/cmd/set/set_serviceaccount.go @@ -33,7 +33,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/set/set_serviceaccount_test.go b/pkg/kubectl/cmd/set/set_serviceaccount_test.go index a518bcb1e4f..64875eded9b 100644 --- a/pkg/kubectl/cmd/set/set_serviceaccount_test.go +++ b/pkg/kubectl/cmd/set/set_serviceaccount_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) const ( diff --git a/pkg/kubectl/cmd/set/set_subject.go b/pkg/kubectl/cmd/set/set_subject.go index 1bb7538f5db..4f52b87595b 100644 --- a/pkg/kubectl/cmd/set/set_subject.go +++ b/pkg/kubectl/cmd/set/set_subject.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/taint/taint.go b/pkg/kubectl/cmd/taint/taint.go index 71490909990..6a8de02a931 100644 --- a/pkg/kubectl/cmd/taint/taint.go +++ b/pkg/kubectl/cmd/taint/taint.go @@ -35,7 +35,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) diff --git a/pkg/kubectl/cmd/taint/taint_test.go b/pkg/kubectl/cmd/taint/taint_test.go index 3b4a9f540e5..e4697e4f348 100644 --- a/pkg/kubectl/cmd/taint/taint_test.go +++ b/pkg/kubectl/cmd/taint/taint_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { diff --git a/pkg/kubectl/cmd/testing/fake.go b/pkg/kubectl/cmd/testing/fake.go index f840f5fcca5..1e84f7e11e7 100644 --- a/pkg/kubectl/cmd/testing/fake.go +++ b/pkg/kubectl/cmd/testing/fake.go @@ -44,12 +44,13 @@ import ( scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubernetes/pkg/kubectl/validation" ) // InternalType is the schema for internal type diff --git a/pkg/kubectl/cmd/testing/util.go b/pkg/kubectl/cmd/testing/util.go index 4e9c969433a..f4956d1940a 100644 --- a/pkg/kubectl/cmd/testing/util.go +++ b/pkg/kubectl/cmd/testing/util.go @@ -29,7 +29,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" restclient "k8s.io/client-go/rest" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) var ( diff --git a/pkg/kubectl/cmd/top/top_node_test.go b/pkg/kubectl/cmd/top/top_node_test.go index d350489a509..697708d258d 100644 --- a/pkg/kubectl/cmd/top/top_node_test.go +++ b/pkg/kubectl/cmd/top/top_node_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" diff --git a/pkg/kubectl/cmd/top/top_pod_test.go b/pkg/kubectl/cmd/top/top_pod_test.go index 61d1ed4a6f9..14e33fe4eb6 100644 --- a/pkg/kubectl/cmd/top/top_pod_test.go +++ b/pkg/kubectl/cmd/top/top_pod_test.go @@ -38,7 +38,7 @@ import ( core "k8s.io/client-go/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" diff --git a/pkg/kubectl/cmd/util/editor/editoptions.go b/pkg/kubectl/cmd/util/editor/editoptions.go index f9b869eb694..727ac2f7e1a 100644 --- a/pkg/kubectl/cmd/util/editor/editoptions.go +++ b/pkg/kubectl/cmd/util/editor/editoptions.go @@ -49,7 +49,7 @@ import ( "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor/crlf" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) // EditOptions contains all the options for running edit cli command. diff --git a/pkg/kubectl/cmd/util/helpers_test.go b/pkg/kubectl/cmd/util/helpers_test.go index e1e2f4522e8..1a3c8abc4a0 100644 --- a/pkg/kubectl/cmd/util/helpers_test.go +++ b/pkg/kubectl/cmd/util/helpers_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/util/kubectl_match_version.go b/pkg/kubectl/cmd/util/kubectl_match_version.go index 25bbf268bbd..075682e0480 100644 --- a/pkg/kubectl/cmd/util/kubectl_match_version.go +++ b/pkg/kubectl/cmd/util/kubectl_match_version.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl/version" diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index d5e56799f1c..caecf8c8b2a 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -65,6 +65,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/reference" "k8s.io/klog" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/certificate" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" @@ -75,7 +76,12 @@ import ( "k8s.io/kubectl/pkg/util/slice" storageutil "k8s.io/kubectl/pkg/util/storage" "k8s.io/kubernetes/pkg/kubectl/describe" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubernetes/pkg/kubectl/util/certificate" + "k8s.io/kubernetes/pkg/kubectl/util/fieldpath" + "k8s.io/kubernetes/pkg/kubectl/util/qos" + resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource" + "k8s.io/kubernetes/pkg/kubectl/util/slice" + storageutil "k8s.io/kubernetes/pkg/kubectl/util/storage" ) // Each level has 2 spaces for PrefixWriter diff --git a/pkg/kubectl/explain/explain_test.go b/pkg/kubectl/explain/explain_test.go index b2586749909..eef15f72ea2 100644 --- a/pkg/kubectl/explain/explain_test.go +++ b/pkg/kubectl/explain/explain_test.go @@ -21,7 +21,7 @@ import ( "testing" "k8s.io/apimachinery/pkg/api/meta/testrestmapper" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestSplitAndParseResourceRequest(t *testing.T) { diff --git a/pkg/kubectl/polymorphichelpers/objectpauser.go b/pkg/kubectl/polymorphichelpers/objectpauser.go index 61aebba36bf..f50daf25585 100644 --- a/pkg/kubectl/polymorphichelpers/objectpauser.go +++ b/pkg/kubectl/polymorphichelpers/objectpauser.go @@ -25,7 +25,7 @@ import ( appsv1beta2 "k8s.io/api/apps/v1beta2" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) // Currently only supports Deployments. diff --git a/pkg/kubectl/polymorphichelpers/objectrestarter.go b/pkg/kubectl/polymorphichelpers/objectrestarter.go index 891762c38dd..cbcf7c882a3 100644 --- a/pkg/kubectl/polymorphichelpers/objectrestarter.go +++ b/pkg/kubectl/polymorphichelpers/objectrestarter.go @@ -26,7 +26,7 @@ import ( appsv1beta2 "k8s.io/api/apps/v1beta2" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func defaultObjectRestarter(obj runtime.Object) ([]byte, error) { diff --git a/pkg/kubectl/polymorphichelpers/objectresumer.go b/pkg/kubectl/polymorphichelpers/objectresumer.go index 90e8b2049c6..783da612513 100644 --- a/pkg/kubectl/polymorphichelpers/objectresumer.go +++ b/pkg/kubectl/polymorphichelpers/objectresumer.go @@ -25,7 +25,7 @@ import ( appsv1beta2 "k8s.io/api/apps/v1beta2" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func defaultObjectResumer(obj runtime.Object) ([]byte, error) { diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index 63d2edd290a..9b80fad8dd4 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/kubernetes" deploymentutil "k8s.io/kubectl/pkg/util/deployment" kapps "k8s.io/kubernetes/pkg/kubectl/apps" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) const ( diff --git a/pkg/kubectl/rolling_updater_test.go b/pkg/kubectl/rolling_updater_test.go index ac37bef85c1..e1514d86da3 100644 --- a/pkg/kubectl/rolling_updater_test.go +++ b/pkg/kubectl/rolling_updater_test.go @@ -40,7 +40,7 @@ import ( restclient "k8s.io/client-go/rest" manualfake "k8s.io/client-go/rest/fake" testcore "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" "k8s.io/kubernetes/pkg/kubectl/util" ) diff --git a/pkg/kubectl/rollout_status.go b/pkg/kubectl/rollout_status.go index d6f39d71398..e9ee65f07cf 100644 --- a/pkg/kubectl/rollout_status.go +++ b/pkg/kubectl/rollout_status.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" deploymentutil "k8s.io/kubectl/pkg/util/deployment" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) // StatusViewer provides an interface for resources that have rollout status. diff --git a/pkg/kubectl/rollout_status_test.go b/pkg/kubectl/rollout_status_test.go index 97238ac7817..0b76b4dee77 100644 --- a/pkg/kubectl/rollout_status_test.go +++ b/pkg/kubectl/rollout_status_test.go @@ -24,7 +24,7 @@ import ( api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubectl/pkg/scheme" ) func TestDeploymentStatusViewerStatus(t *testing.T) {