diff --git a/pkg/kubectl/cmd/auth/cani_test.go b/pkg/kubectl/cmd/auth/cani_test.go index 161356428b0..c788afbfd6f 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" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestRunAccessCheck(t *testing.T) { diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 067599ef38c..234522e873e 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -30,51 +30,51 @@ import ( "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/cmd/annotate" + "k8s.io/kubectl/pkg/cmd/apiresources" + "k8s.io/kubectl/pkg/cmd/apply" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/autoscale" + "k8s.io/kubectl/pkg/cmd/certificates" + "k8s.io/kubectl/pkg/cmd/clusterinfo" + "k8s.io/kubectl/pkg/cmd/completion" + cmdconfig "k8s.io/kubectl/pkg/cmd/config" + "k8s.io/kubectl/pkg/cmd/cp" + "k8s.io/kubectl/pkg/cmd/create" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/describe" + "k8s.io/kubectl/pkg/cmd/diff" + "k8s.io/kubectl/pkg/cmd/drain" + "k8s.io/kubectl/pkg/cmd/edit" + cmdexec "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/explain" + "k8s.io/kubectl/pkg/cmd/expose" + "k8s.io/kubectl/pkg/cmd/label" + "k8s.io/kubectl/pkg/cmd/logs" + "k8s.io/kubectl/pkg/cmd/options" + "k8s.io/kubectl/pkg/cmd/patch" + "k8s.io/kubectl/pkg/cmd/plugin" + "k8s.io/kubectl/pkg/cmd/portforward" + "k8s.io/kubectl/pkg/cmd/proxy" + "k8s.io/kubectl/pkg/cmd/replace" + "k8s.io/kubectl/pkg/cmd/rollingupdate" + "k8s.io/kubectl/pkg/cmd/rollout" + "k8s.io/kubectl/pkg/cmd/run" + "k8s.io/kubectl/pkg/cmd/scale" + "k8s.io/kubectl/pkg/cmd/set" + "k8s.io/kubectl/pkg/cmd/taint" + "k8s.io/kubectl/pkg/cmd/top" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/cmd/version" + "k8s.io/kubectl/pkg/cmd/wait" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/annotate" - "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" - "k8s.io/kubernetes/pkg/kubectl/cmd/attach" "k8s.io/kubernetes/pkg/kubectl/cmd/auth" - "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale" - "k8s.io/kubernetes/pkg/kubectl/cmd/certificates" - "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo" - "k8s.io/kubernetes/pkg/kubectl/cmd/completion" - cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" - "k8s.io/kubernetes/pkg/kubectl/cmd/cp" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/describe" - "k8s.io/kubernetes/pkg/kubectl/cmd/diff" - "k8s.io/kubernetes/pkg/kubectl/cmd/drain" - "k8s.io/kubernetes/pkg/kubectl/cmd/edit" - cmdexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/explain" - "k8s.io/kubernetes/pkg/kubectl/cmd/expose" "k8s.io/kubernetes/pkg/kubectl/cmd/get" - "k8s.io/kubernetes/pkg/kubectl/cmd/label" - "k8s.io/kubernetes/pkg/kubectl/cmd/logs" - "k8s.io/kubernetes/pkg/kubectl/cmd/options" - "k8s.io/kubernetes/pkg/kubectl/cmd/patch" - "k8s.io/kubernetes/pkg/kubectl/cmd/plugin" - "k8s.io/kubernetes/pkg/kubectl/cmd/portforward" - "k8s.io/kubernetes/pkg/kubectl/cmd/proxy" - "k8s.io/kubernetes/pkg/kubectl/cmd/replace" - "k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate" - "k8s.io/kubernetes/pkg/kubectl/cmd/rollout" - "k8s.io/kubernetes/pkg/kubectl/cmd/run" - "k8s.io/kubernetes/pkg/kubectl/cmd/scale" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" - "k8s.io/kubernetes/pkg/kubectl/cmd/taint" - "k8s.io/kubernetes/pkg/kubectl/cmd/top" - "k8s.io/kubernetes/pkg/kubectl/cmd/version" - "k8s.io/kubernetes/pkg/kubectl/cmd/wait" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize" + "k8s.io/kubectl/pkg/cmd/kustomize" ) const ( diff --git a/pkg/kubectl/cmd/convert/convert_test.go b/pkg/kubectl/cmd/convert/convert_test.go index 18ae86cf77b..abe594ee7cd 100644 --- a/pkg/kubectl/cmd/convert/convert_test.go +++ b/pkg/kubectl/cmd/convert/convert_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" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type testcase struct { diff --git a/pkg/kubectl/cmd/get/get_test.go b/pkg/kubectl/cmd/get/get_test.go index 30903eede19..e7610a9b213 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/pkg/kubectl/cmd/get/get_test.go @@ -50,7 +50,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" openapitesting "k8s.io/kubectl/pkg/util/openapi/testing" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go index 92c0e417924..46a136e247f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go index 1eed94a05fb..b6de182f792 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go @@ -53,7 +53,7 @@ import ( "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" + "k8s.io/kubectl/pkg/cmd/delete" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index 2c04db4460e..8e2c8c4892d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -49,7 +49,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go index 0b79170dd85..4a5b368ceb1 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go @@ -36,7 +36,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" + "k8s.io/kubectl/pkg/cmd/exec" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go index 1c28a540c62..ab5fcc69ead 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/tools/remotecommand" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/exec" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteAttach struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go index bbe62f0be6d..95babc8a6ec 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go @@ -23,7 +23,7 @@ import ( "testing" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestSetupOutputWriterNoOp(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go index 8f315fbfb5b..4cea2de42d2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go @@ -33,7 +33,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" + "k8s.io/kubectl/pkg/cmd/exec" "bytes" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go index fdd86165d7d..c281f6c152b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go @@ -40,8 +40,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - kexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + kexec "k8s.io/kubectl/pkg/cmd/exec" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type FileType int diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go index 6c5eef0fe65..541e8a8ec6e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateClusterRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go index facea12a5e7..1df8acc7691 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateClusterRoleBinding(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go index e9114a17c90..23a872842ca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateConfigMap(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go index 7f70184ebb7..e89565d4fdd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest/fake" generateversioned "k8s.io/kubectl/pkg/generate/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func Test_generatorFromName(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go index 23ed2492911..6ad727f9755 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateNamespace(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go index 8da5917a503..19e20a9ef9e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreatePdb(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go index 26464ec69db..de511885998 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go @@ -27,7 +27,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreatePriorityClass(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go index 2f48fd75541..430e387976b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateQuota(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go index 2ba453a7ef2..ad25e11b575 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateRole(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go index 620cc6d3e12..ba814065635 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go @@ -32,7 +32,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go index 7ed86bc852f..ac5505196ef 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateSecretGeneric(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go index 5a3943f8773..b9af93b0dcc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go index e9e549aad08..293fc2ccad0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go index 669ac10024d..c80ef26b236 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestExtraArgsFail(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go index a21fbbf7d78..e0c8b6a7875 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - cmdwait "k8s.io/kubernetes/pkg/kubectl/cmd/wait" + cmdwait "k8s.io/kubectl/pkg/cmd/wait" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index 7daf8294638..da8a733482c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func fakecmd() *cobra.Command { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go index 294c3115055..e3aec934130 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/kubectl/pkg/describe" versioneddescribe "k8s.io/kubectl/pkg/describe/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go index faaa735f3e4..8d49b3839b3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go @@ -42,7 +42,7 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" + "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/utils/exec" "sigs.k8s.io/yaml" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go index a910aaba57a..5c4dd68343d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go @@ -50,7 +50,7 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go index 611175009d7..5a4392ea518 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go @@ -39,9 +39,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/cmd/apply" - "k8s.io/kubernetes/pkg/kubectl/cmd/create" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/apply" + "k8s.io/kubectl/pkg/cmd/create" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type EditTestCase struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go index 9f894c565c5..b132d44ed60 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/term" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteExecutor struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go index a0ea1a2bf40..cfe504b07e5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestRunExposeService(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index 93d5c448f29..e46232d4b75 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateLabels(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go index 2fd150bbcb4..c783a06cb2d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go @@ -33,7 +33,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestLog(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go index 33ba14649bc..ad8b2afe382 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestPatchObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go index a491d47aac6..bdd67d39468 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakePortForwarder struct { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go index 0c01824f86c..911497e0089 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" + "k8s.io/kubectl/pkg/cmd/delete" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go index 342fcd18a89..48b310b63c4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestReplaceObject(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go index d063c6cbdd2..a3aa07ee1fb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go @@ -20,7 +20,7 @@ import ( "testing" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidateArgs(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go index 61ba901cc14..8c62d20cbc3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go index 0c0c4dda09f..e7566b00a3b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go @@ -31,7 +31,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go index 7d60f2165c6..ebc49b25cd8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go @@ -30,7 +30,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go index eb96500d54f..63a5a8d975b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go @@ -31,7 +31,7 @@ import ( "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/set" + "k8s.io/kubectl/pkg/cmd/set" ) // ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go index ace13a74384..06d2efe92bd 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run.go @@ -50,10 +50,10 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/cmd/attach" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/logs" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/logs" uexec "k8s.io/utils/exec" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go index ff18cb91858..aa7d16db49d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go @@ -39,8 +39,8 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + "k8s.io/kubectl/pkg/cmd/delete" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go index ad18f20afc7..263604e4765 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go @@ -38,7 +38,7 @@ import ( "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/templates" - envutil "k8s.io/kubernetes/pkg/kubectl/cmd/set/env" + envutil "k8s.io/kubectl/pkg/cmd/set/env" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go index 2881245a49e..027d931a8f0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestSetEnvLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go index 486f206138f..cb8f2d80eac 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go @@ -39,7 +39,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestImageLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go index 1302a0a6d1c..9d7f72fc609 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestResourcesLocal(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go index 1043999a887..3ec73cd9399 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go @@ -38,7 +38,7 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) const ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go index 00ea2b0ab03..91cb6e6cc42 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/resource" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestValidate(t *testing.T) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go index bf42d587c4c..54d85f86d06 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go index 83ac08e6aa9..31fbed974bf 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" 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/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go index e654d955657..abea6a19af6 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go @@ -38,7 +38,7 @@ import ( core "k8s.io/client-go/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" 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/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go index eaa6856444c..09121a61eca 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" - cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" )