From 14837690817d34f9d01c331ffa52d5b225c36584 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 1 Aug 2019 13:14:06 -0700 Subject: [PATCH] Update gofmt Kubernetes-commit: e2cae2344486af198f8ab38e4dd97d4f24dfd190 --- pkg/cmd/annotate/annotate_test.go | 2 +- pkg/cmd/apply/apply.go | 2 +- pkg/cmd/apply/apply_test.go | 2 +- pkg/cmd/attach/attach.go | 2 +- pkg/cmd/attach/attach_test.go | 4 ++-- pkg/cmd/cp/cp.go | 2 +- pkg/cmd/cp/cp_test.go | 2 +- pkg/cmd/create/create_clusterrole_test.go | 2 +- pkg/cmd/create/create_clusterrolebinding_test.go | 2 +- pkg/cmd/create/create_configmap_test.go | 2 +- pkg/cmd/create/create_deployment_test.go | 2 +- pkg/cmd/create/create_namespace_test.go | 2 +- pkg/cmd/create/create_pdb_test.go | 2 +- pkg/cmd/create/create_priorityclass_test.go | 2 +- pkg/cmd/create/create_role_test.go | 2 +- pkg/cmd/create/create_rolebinding_test.go | 2 +- pkg/cmd/create/create_secret_test.go | 2 +- pkg/cmd/create/create_service_test.go | 2 +- pkg/cmd/create/create_serviceaccount_test.go | 2 +- pkg/cmd/create/create_test.go | 2 +- pkg/cmd/delete/delete.go | 2 +- pkg/cmd/delete/delete_test.go | 2 +- pkg/cmd/describe/describe_test.go | 2 +- pkg/cmd/diff/diff.go | 2 +- pkg/cmd/drain/drain_test.go | 2 +- pkg/cmd/edit/edit_test.go | 2 +- pkg/cmd/exec/exec_test.go | 2 +- pkg/cmd/expose/expose_test.go | 2 +- pkg/cmd/label/label_test.go | 2 +- pkg/cmd/patch/patch_test.go | 2 +- pkg/cmd/portforward/portforward_test.go | 2 +- pkg/cmd/replace/replace.go | 2 +- pkg/cmd/replace/replace_test.go | 2 +- pkg/cmd/rollout/rollout_pause.go | 2 +- pkg/cmd/rollout/rollout_pause_test.go | 2 +- pkg/cmd/rollout/rollout_restart.go | 2 +- pkg/cmd/rollout/rollout_resume.go | 2 +- pkg/cmd/run/run.go | 8 ++++---- pkg/cmd/run/run_test.go | 4 ++-- pkg/cmd/set/set_env.go | 2 +- pkg/cmd/set/set_env_test.go | 2 +- pkg/cmd/set/set_image_test.go | 2 +- pkg/cmd/set/set_resources_test.go | 2 +- pkg/cmd/set/set_serviceaccount_test.go | 2 +- pkg/cmd/taint/taint_test.go | 2 +- pkg/cmd/top/top_node_test.go | 2 +- pkg/cmd/top/top_pod_test.go | 2 +- 47 files changed, 52 insertions(+), 52 deletions(-) diff --git a/pkg/cmd/annotate/annotate_test.go b/pkg/cmd/annotate/annotate_test.go index 46a136e24..ae9bcff3f 100644 --- a/pkg/cmd/annotate/annotate_test.go +++ b/pkg/cmd/annotate/annotate_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateAnnotationOverwrites(t *testing.T) { diff --git a/pkg/cmd/apply/apply.go b/pkg/cmd/apply/apply.go index b6de182f7..aaa2de08f 100644 --- a/pkg/cmd/apply/apply.go +++ b/pkg/cmd/apply/apply.go @@ -46,6 +46,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/klog" oapi "k8s.io/kube-openapi/pkg/util/proto" + "k8s.io/kubectl/pkg/cmd/delete" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" @@ -53,7 +54,6 @@ import ( "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubectl/pkg/cmd/delete" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/pkg/cmd/apply/apply_test.go b/pkg/cmd/apply/apply_test.go index 8e2c8c489..fb185a1b3 100644 --- a/pkg/cmd/apply/apply_test.go +++ b/pkg/cmd/apply/apply_test.go @@ -46,10 +46,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" clienttesting "k8s.io/client-go/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/openapi" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/cmd/attach/attach.go b/pkg/cmd/attach/attach.go index 4a5b368ce..c39e5ce50 100644 --- a/pkg/cmd/attach/attach.go +++ b/pkg/cmd/attach/attach.go @@ -31,12 +31,12 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" + "k8s.io/kubectl/pkg/cmd/exec" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/exec" ) var ( diff --git a/pkg/cmd/attach/attach_test.go b/pkg/cmd/attach/attach_test.go index ab5fcc69e..8c6f01929 100644 --- a/pkg/cmd/attach/attach_test.go +++ b/pkg/cmd/attach/attach_test.go @@ -33,10 +33,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/client-go/tools/remotecommand" - "k8s.io/kubectl/pkg/polymorphichelpers" - "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/cmd/exec" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/polymorphichelpers" + "k8s.io/kubectl/pkg/scheme" ) type fakeRemoteAttach struct { diff --git a/pkg/cmd/cp/cp.go b/pkg/cmd/cp/cp.go index 4cea2de42..1c7b0bf6e 100644 --- a/pkg/cmd/cp/cp.go +++ b/pkg/cmd/cp/cp.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/kubectl/pkg/cmd/exec" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/exec" "bytes" diff --git a/pkg/cmd/cp/cp_test.go b/pkg/cmd/cp/cp_test.go index c281f6c15..5490a8939 100644 --- a/pkg/cmd/cp/cp_test.go +++ b/pkg/cmd/cp/cp_test.go @@ -39,9 +39,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" kexec "k8s.io/kubectl/pkg/cmd/exec" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) type FileType int diff --git a/pkg/cmd/create/create_clusterrole_test.go b/pkg/cmd/create/create_clusterrole_test.go index 541e8a8ec..937763ecb 100644 --- a/pkg/cmd/create/create_clusterrole_test.go +++ b/pkg/cmd/create/create_clusterrole_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRole(t *testing.T) { diff --git a/pkg/cmd/create/create_clusterrolebinding_test.go b/pkg/cmd/create/create_clusterrolebinding_test.go index 1df8acc76..cc1d1a9b0 100644 --- a/pkg/cmd/create/create_clusterrolebinding_test.go +++ b/pkg/cmd/create/create_clusterrolebinding_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateClusterRoleBinding(t *testing.T) { diff --git a/pkg/cmd/create/create_configmap_test.go b/pkg/cmd/create/create_configmap_test.go index 23a872842..78495a201 100644 --- a/pkg/cmd/create/create_configmap_test.go +++ b/pkg/cmd/create/create_configmap_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateConfigMap(t *testing.T) { diff --git a/pkg/cmd/create/create_deployment_test.go b/pkg/cmd/create/create_deployment_test.go index e89565d4f..23540eb24 100644 --- a/pkg/cmd/create/create_deployment_test.go +++ b/pkg/cmd/create/create_deployment_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" generateversioned "k8s.io/kubectl/pkg/generate/versioned" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func Test_generatorFromName(t *testing.T) { diff --git a/pkg/cmd/create/create_namespace_test.go b/pkg/cmd/create/create_namespace_test.go index 6ad727f97..1f52306f8 100644 --- a/pkg/cmd/create/create_namespace_test.go +++ b/pkg/cmd/create/create_namespace_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateNamespace(t *testing.T) { diff --git a/pkg/cmd/create/create_pdb_test.go b/pkg/cmd/create/create_pdb_test.go index 19e20a9ef..3633b186a 100644 --- a/pkg/cmd/create/create_pdb_test.go +++ b/pkg/cmd/create/create_pdb_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePdb(t *testing.T) { diff --git a/pkg/cmd/create/create_priorityclass_test.go b/pkg/cmd/create/create_priorityclass_test.go index de5118859..d4e39b6d8 100644 --- a/pkg/cmd/create/create_priorityclass_test.go +++ b/pkg/cmd/create/create_priorityclass_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreatePriorityClass(t *testing.T) { diff --git a/pkg/cmd/create/create_role_test.go b/pkg/cmd/create/create_role_test.go index ad25e11b5..7de495159 100644 --- a/pkg/cmd/create/create_role_test.go +++ b/pkg/cmd/create/create_role_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/util/diff" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateRole(t *testing.T) { diff --git a/pkg/cmd/create/create_rolebinding_test.go b/pkg/cmd/create/create_rolebinding_test.go index ba8140656..40d060a17 100644 --- a/pkg/cmd/create/create_rolebinding_test.go +++ b/pkg/cmd/create/create_rolebinding_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} diff --git a/pkg/cmd/create/create_secret_test.go b/pkg/cmd/create/create_secret_test.go index ac5505196..075293ba6 100644 --- a/pkg/cmd/create/create_secret_test.go +++ b/pkg/cmd/create/create_secret_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateSecretGeneric(t *testing.T) { diff --git a/pkg/cmd/create/create_service_test.go b/pkg/cmd/create/create_service_test.go index b9af93b0d..792055021 100644 --- a/pkg/cmd/create/create_service_test.go +++ b/pkg/cmd/create/create_service_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateService(t *testing.T) { diff --git a/pkg/cmd/create/create_serviceaccount_test.go b/pkg/cmd/create/create_serviceaccount_test.go index 293fc2cca..ff0a4cb41 100644 --- a/pkg/cmd/create/create_serviceaccount_test.go +++ b/pkg/cmd/create/create_serviceaccount_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestCreateServiceAccount(t *testing.T) { diff --git a/pkg/cmd/create/create_test.go b/pkg/cmd/create/create_test.go index c80ef26b2..2dad484dc 100644 --- a/pkg/cmd/create/create_test.go +++ b/pkg/cmd/create/create_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestExtraArgsFail(t *testing.T) { diff --git a/pkg/cmd/delete/delete.go b/pkg/cmd/delete/delete.go index e0c8b6a78..8739a5336 100644 --- a/pkg/cmd/delete/delete.go +++ b/pkg/cmd/delete/delete.go @@ -34,10 +34,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/dynamic" cmdutil "k8s.io/kubectl/pkg/cmd/util" + cmdwait "k8s.io/kubectl/pkg/cmd/wait" "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - cmdwait "k8s.io/kubectl/pkg/cmd/wait" ) var ( diff --git a/pkg/cmd/delete/delete_test.go b/pkg/cmd/delete/delete_test.go index da8a73348..5fdd62549 100644 --- a/pkg/cmd/delete/delete_test.go +++ b/pkg/cmd/delete/delete_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func fakecmd() *cobra.Command { diff --git a/pkg/cmd/describe/describe_test.go b/pkg/cmd/describe/describe_test.go index e3aec9341..e95e70bef 100644 --- a/pkg/cmd/describe/describe_test.go +++ b/pkg/cmd/describe/describe_test.go @@ -26,10 +26,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" "k8s.io/kubectl/pkg/describe" versioneddescribe "k8s.io/kubectl/pkg/describe/versioned" "k8s.io/kubectl/pkg/scheme" - 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/pkg/cmd/diff/diff.go b/pkg/cmd/diff/diff.go index 8d49b3839..e64df1ddb 100644 --- a/pkg/cmd/diff/diff.go +++ b/pkg/cmd/diff/diff.go @@ -36,13 +36,13 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" "k8s.io/klog" + "k8s.io/kubectl/pkg/cmd/apply" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/utils/exec" "sigs.k8s.io/yaml" ) diff --git a/pkg/cmd/drain/drain_test.go b/pkg/cmd/drain/drain_test.go index 5c4dd6834..94e1e1ab9 100644 --- a/pkg/cmd/drain/drain_test.go +++ b/pkg/cmd/drain/drain_test.go @@ -47,10 +47,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/cmd/edit/edit_test.go b/pkg/cmd/edit/edit_test.go index 5a4392ea5..796242b8b 100644 --- a/pkg/cmd/edit/edit_test.go +++ b/pkg/cmd/edit/edit_test.go @@ -38,10 +38,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/apply" "k8s.io/kubectl/pkg/cmd/create" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + cmdutil "k8s.io/kubectl/pkg/cmd/util" ) type EditTestCase struct { diff --git a/pkg/cmd/exec/exec_test.go b/pkg/cmd/exec/exec_test.go index b132d44ed..0880dee25 100644 --- a/pkg/cmd/exec/exec_test.go +++ b/pkg/cmd/exec/exec_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/rest/fake" "k8s.io/client-go/tools/remotecommand" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/term" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) type fakeRemoteExecutor struct { diff --git a/pkg/cmd/expose/expose_test.go b/pkg/cmd/expose/expose_test.go index cfe504b07..a94592b32 100644 --- a/pkg/cmd/expose/expose_test.go +++ b/pkg/cmd/expose/expose_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestRunExposeService(t *testing.T) { diff --git a/pkg/cmd/label/label_test.go b/pkg/cmd/label/label_test.go index e46232d4b..828b8a146 100644 --- a/pkg/cmd/label/label_test.go +++ b/pkg/cmd/label/label_test.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestValidateLabels(t *testing.T) { diff --git a/pkg/cmd/patch/patch_test.go b/pkg/cmd/patch/patch_test.go index ad8b2afe3..b5b7ef2fe 100644 --- a/pkg/cmd/patch/patch_test.go +++ b/pkg/cmd/patch/patch_test.go @@ -24,8 +24,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestPatchObject(t *testing.T) { diff --git a/pkg/cmd/portforward/portforward_test.go b/pkg/cmd/portforward/portforward_test.go index bdd67d394..d3a91c100 100644 --- a/pkg/cmd/portforward/portforward_test.go +++ b/pkg/cmd/portforward/portforward_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) type fakePortForwarder struct { diff --git a/pkg/cmd/replace/replace.go b/pkg/cmd/replace/replace.go index 911497e00..f59800135 100644 --- a/pkg/cmd/replace/replace.go +++ b/pkg/cmd/replace/replace.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/delete" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/scheme" @@ -41,7 +42,6 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" - "k8s.io/kubectl/pkg/cmd/delete" ) var ( diff --git a/pkg/cmd/replace/replace_test.go b/pkg/cmd/replace/replace_test.go index 48b310b63..d90027e71 100644 --- a/pkg/cmd/replace/replace_test.go +++ b/pkg/cmd/replace/replace_test.go @@ -25,8 +25,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestReplaceObject(t *testing.T) { diff --git a/pkg/cmd/rollout/rollout_pause.go b/pkg/cmd/rollout/rollout_pause.go index 8c62d20cb..645806abd 100644 --- a/pkg/cmd/rollout/rollout_pause.go +++ b/pkg/cmd/rollout/rollout_pause.go @@ -26,12 +26,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "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/pkg/cmd/rollout/rollout_pause_test.go b/pkg/cmd/rollout/rollout_pause_test.go index e7566b00a..28f421369 100644 --- a/pkg/cmd/rollout/rollout_pause_test.go +++ b/pkg/cmd/rollout/rollout_pause_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} diff --git a/pkg/cmd/rollout/rollout_restart.go b/pkg/cmd/rollout/rollout_restart.go index ebc49b25c..4ef7b54af 100644 --- a/pkg/cmd/rollout/rollout_restart.go +++ b/pkg/cmd/rollout/rollout_restart.go @@ -25,12 +25,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "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/pkg/cmd/rollout/rollout_resume.go b/pkg/cmd/rollout/rollout_resume.go index 63a5a8d97..b41593f99 100644 --- a/pkg/cmd/rollout/rollout_resume.go +++ b/pkg/cmd/rollout/rollout_resume.go @@ -26,12 +26,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/cmd/set" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "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/pkg/cmd/run/run.go b/pkg/cmd/run/run.go index 06d2efe92..f292bd399 100644 --- a/pkg/cmd/run/run.go +++ b/pkg/cmd/run/run.go @@ -41,6 +41,10 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" + "k8s.io/kubectl/pkg/cmd/attach" + "k8s.io/kubectl/pkg/cmd/delete" + "k8s.io/kubectl/pkg/cmd/exec" + "k8s.io/kubectl/pkg/cmd/logs" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/generate" generateversioned "k8s.io/kubectl/pkg/generate/versioned" @@ -50,10 +54,6 @@ import ( "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" - "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/pkg/cmd/run/run_test.go b/pkg/cmd/run/run_test.go index aa7d16db4..0a153a54b 100644 --- a/pkg/cmd/run/run_test.go +++ b/pkg/cmd/run/run_test.go @@ -36,11 +36,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" + "k8s.io/kubectl/pkg/cmd/delete" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubectl/pkg/cmd/delete" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/pkg/cmd/set/set_env.go b/pkg/cmd/set/set_env.go index 263604e47..cb84c7296 100644 --- a/pkg/cmd/set/set_env.go +++ b/pkg/cmd/set/set_env.go @@ -34,11 +34,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" + envutil "k8s.io/kubectl/pkg/cmd/set/env" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/templates" - envutil "k8s.io/kubectl/pkg/cmd/set/env" ) var ( diff --git a/pkg/cmd/set/set_env_test.go b/pkg/cmd/set/set_env_test.go index 027d931a8..9726037e7 100644 --- a/pkg/cmd/set/set_env_test.go +++ b/pkg/cmd/set/set_env_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestSetEnvLocal(t *testing.T) { diff --git a/pkg/cmd/set/set_image_test.go b/pkg/cmd/set/set_image_test.go index cb8f2d80e..806da6dbf 100644 --- a/pkg/cmd/set/set_image_test.go +++ b/pkg/cmd/set/set_image_test.go @@ -38,8 +38,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestImageLocal(t *testing.T) { diff --git a/pkg/cmd/set/set_resources_test.go b/pkg/cmd/set/set_resources_test.go index 9d7f72fc6..692520434 100644 --- a/pkg/cmd/set/set_resources_test.go +++ b/pkg/cmd/set/set_resources_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) func TestResourcesLocal(t *testing.T) { diff --git a/pkg/cmd/set/set_serviceaccount_test.go b/pkg/cmd/set/set_serviceaccount_test.go index 3ec73cd93..59a3c1ce6 100644 --- a/pkg/cmd/set/set_serviceaccount_test.go +++ b/pkg/cmd/set/set_serviceaccount_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "k8s.io/kubectl/pkg/scheme" ) const ( diff --git a/pkg/cmd/taint/taint_test.go b/pkg/cmd/taint/taint_test.go index 54d85f86d..fce91c15e 100644 --- a/pkg/cmd/taint/taint_test.go +++ b/pkg/cmd/taint/taint_test.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - cmdtesting "k8s.io/kubectl/pkg/cmd/testing" ) func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { diff --git a/pkg/cmd/top/top_node_test.go b/pkg/cmd/top/top_node_test.go index 31fbed974..1240f8c32 100644 --- a/pkg/cmd/top/top_node_test.go +++ b/pkg/cmd/top/top_node_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" - "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubectl/pkg/cmd/testing" + "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/cmd/top/top_pod_test.go b/pkg/cmd/top/top_pod_test.go index abea6a19a..d077d1d15 100644 --- a/pkg/cmd/top/top_pod_test.go +++ b/pkg/cmd/top/top_pod_test.go @@ -36,9 +36,9 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" core "k8s.io/client-go/testing" + cmdtesting "k8s.io/kubectl/pkg/cmd/testing" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/scheme" - 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"