Merge pull request #80876 from seans3/move-kubectl-cmd

Move /pkg/kubectl/cmd/{command} to staging

build/visible_to/BUILD

@@ -84,12 +84,13 @@ package_group(
         "//cmd/kubectl/app",
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
-        "//pkg/kubectl/cmd/config",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
-        "//pkg/kubectl/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config",
-        "//pkg/kubectl/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
-        "//pkg/kubectl/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing",
-        "//pkg/kubectl/cmd/util/editor",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor",
     ],
 )
 
@@ -112,6 +113,8 @@ package_group(
         "//cmd/kubectl/app",
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
+        "//staging/src/k8s.io/kubectl/pkg",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
     ],
 )
 
@@ -119,7 +122,8 @@ package_group(
     name = "pkg_kubectl_cmd_auth_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
     ],
 )
 
@@ -127,6 +131,7 @@ package_group(
     name = "pkg_kubectl_cmd_config_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
     ],
 )
 
@@ -134,7 +139,8 @@ package_group(
     name = "pkg_kubectl_cmd_create_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
     ],
 )
 
@@ -142,6 +148,7 @@ package_group(
     name = "pkg_kubectl_cmd_get_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
     ],
 )
 
@@ -149,6 +156,7 @@ package_group(
     name = "pkg_kubectl_cmd_rollout_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
     ],
 )
 
@@ -156,7 +164,8 @@ package_group(
     name = "pkg_kubectl_cmd_set_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
     ],
 )
 
@@ -170,57 +179,58 @@ package_group(
         "//cmd/kubectl",
         "//cmd/kubectl/app",
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/annotate",
-        "//pkg/kubectl/cmd/apiresources",
-        "//pkg/kubectl/cmd/apply",
-        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
-        "//pkg/kubectl/cmd/autoscale",
-        "//pkg/kubectl/cmd/certificates",
-        "//pkg/kubectl/cmd/clusterinfo",
-        "//pkg/kubectl/cmd/completion",
-        "//pkg/kubectl/cmd/config",
         "//pkg/kubectl/cmd/convert",
-        "//pkg/kubectl/cmd/cp",
-        "//pkg/kubectl/cmd/create",
-        "//pkg/kubectl/cmd/delete",
-        "//pkg/kubectl/cmd/describe",
-        "//pkg/kubectl/cmd/diff",
-        "//pkg/kubectl/cmd/drain",
-        "//pkg/kubectl/cmd/edit",
-        "//pkg/kubectl/cmd/exec",
-        "//pkg/kubectl/cmd/explain",
-        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
-        "//pkg/kubectl/cmd/help",
-        "//pkg/kubectl/cmd/kustomize",
-        "//pkg/kubectl/cmd/label",
-        "//pkg/kubectl/cmd/logs",
-        "//pkg/kubectl/cmd/options",
-        "//pkg/kubectl/cmd/patch",
-        "//pkg/kubectl/cmd/plugin",
-        "//pkg/kubectl/cmd/portforward",
-        "//pkg/kubectl/cmd/proxy",
-        "//pkg/kubectl/cmd/replace",
-        "//pkg/kubectl/cmd/rollingupdate",
-        "//pkg/kubectl/cmd/rollout",
-        "//pkg/kubectl/cmd/run",
-        "//pkg/kubectl/cmd/scale",
-        "//pkg/kubectl/cmd/set",
-        "//pkg/kubectl/cmd/taint",
-        "//pkg/kubectl/cmd/top",
-        "//pkg/kubectl/cmd/util",
-        "//pkg/kubectl/cmd/util/sanity",
-        "//pkg/kubectl/cmd/version",
-        "//pkg/kubectl/cmd/wait",
         "//pkg/kubectl/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/annotate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/attach",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/certificates",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/completion",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/cp",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/describe",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/diff",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/drain",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/explain",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/expose",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/help",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/label",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/logs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/options",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/patch",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/plugin",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/portforward",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/proxy",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/run",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/scale",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/taint",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/version",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/wait",
     ],
 )
 
 package_group(
     name = "pkg_kubectl_cmd_edit_testdata_CONSUMERS",
     packages = [
-        "//pkg/kubectl/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
     ],
 )
 
@@ -228,34 +238,35 @@ package_group(
     name = "pkg_kubectl_cmd_testing_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/annotate",
-        "//pkg/kubectl/cmd/apply",
-        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
-        "//pkg/kubectl/cmd/clusterinfo",
         "//pkg/kubectl/cmd/convert",
-        "//pkg/kubectl/cmd/cp",
-        "//pkg/kubectl/cmd/create",
-        "//pkg/kubectl/cmd/delete",
-        "//pkg/kubectl/cmd/describe",
-        "//pkg/kubectl/cmd/drain",
-        "//pkg/kubectl/cmd/edit",
-        "//pkg/kubectl/cmd/exec",
-        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
-        "//pkg/kubectl/cmd/label",
-        "//pkg/kubectl/cmd/logs",
-        "//pkg/kubectl/cmd/patch",
-        "//pkg/kubectl/cmd/portforward",
-        "//pkg/kubectl/cmd/replace",
-        "//pkg/kubectl/cmd/rollingupdate",
-        "//pkg/kubectl/cmd/rollout",
-        "//pkg/kubectl/cmd/run",
-        "//pkg/kubectl/cmd/set",
-        "//pkg/kubectl/cmd/taint",
-        "//pkg/kubectl/cmd/testing",
-        "//pkg/kubectl/cmd/top",
         "//pkg/kubectl/explain",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/annotate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/attach",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/cp",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/describe",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/drain",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/expose",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/label",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/logs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/patch",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/portforward",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/run",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/taint",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top",
     ],
 )
 
@@ -270,49 +281,50 @@ package_group(
         "//cmd/kubectl",
         "//cmd/kubectl/app",
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/annotate",
-        "//pkg/kubectl/cmd/apiresources",
-        "//pkg/kubectl/cmd/apply",
-        "//pkg/kubectl/cmd/attach",
         "//pkg/kubectl/cmd/auth",
-        "//pkg/kubectl/cmd/autoscale",
-        "//pkg/kubectl/cmd/certificates",
-        "//pkg/kubectl/cmd/clusterinfo",
-        "//pkg/kubectl/cmd/completion",
-        "//pkg/kubectl/cmd/config",
         "//pkg/kubectl/cmd/convert",
-        "//pkg/kubectl/cmd/cp",
-        "//pkg/kubectl/cmd/create",
-        "//pkg/kubectl/cmd/delete",
-        "//pkg/kubectl/cmd/describe",
-        "//pkg/kubectl/cmd/diff",
-        "//pkg/kubectl/cmd/drain",
-        "//pkg/kubectl/cmd/edit",
-        "//pkg/kubectl/cmd/exec",
-        "//pkg/kubectl/cmd/explain",
-        "//pkg/kubectl/cmd/expose",
         "//pkg/kubectl/cmd/get",
-        "//pkg/kubectl/cmd/help",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
-        "//pkg/kubectl/cmd/label",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/annotate",
-        "//pkg/kubectl/cmd/logs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources",
-        "//pkg/kubectl/cmd/patch",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply",
-        "//pkg/kubectl/cmd/plugin",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/attach",
-        "//pkg/kubectl/cmd/portforward",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale",
-        "//pkg/kubectl/cmd/proxy",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/certificates",
-        "//pkg/kubectl/cmd/replace",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo",
-        "//pkg/kubectl/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/completion",
-        "//pkg/kubectl/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config",
-        "//pkg/kubectl/cmd/run",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/cp",
-        "//pkg/kubectl/cmd/scale",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create",
-        "//pkg/kubectl/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete",
-        "//pkg/kubectl/cmd/taint",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/describe",
-        "//pkg/kubectl/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/diff",
-        "//pkg/kubectl/cmd/top",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/drain",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
-        "//pkg/kubectl/cmd/util/editor",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec",
-        "//pkg/kubectl/cmd/util/sanity",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/explain",
-        "//pkg/kubectl/cmd/version",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/expose",
-        "//pkg/kubectl/cmd/wait",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/help",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/label",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/logs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/patch",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/plugin",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/portforward",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/proxy",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/run",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/scale",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/taint",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/version",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/wait",
     ],
 )
 
@@ -320,10 +332,11 @@ package_group(
     name = "pkg_kubectl_cmd_util_editor_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/apply",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
-        "//pkg/kubectl/cmd/create",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply",
-        "//pkg/kubectl/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
     ],
 )
 
@@ -331,7 +344,8 @@ package_group(
     name = "pkg_kubectl_cmd_util_jsonmerge_CONSUMERS",
     packages = [
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
     ],
 )
 
@@ -339,7 +353,7 @@ package_group(
     name = "pkg_kubectl_cmd_util_sanity_CONSUMERS",
     packages = [
         "//cmd/clicheck",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
     ],
 )
 
@@ -353,7 +367,8 @@ package_group(
         "//cmd/kubectl/app",
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/top",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top",
     ],
 )
 
@@ -369,14 +384,15 @@ package_group(
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
         "//pkg/kubectl/cmd/auth",
-        "//pkg/kubectl/cmd/config",
-        "//pkg/kubectl/cmd/create",
         "//pkg/kubectl/cmd/get",
-        "//pkg/kubectl/cmd/rollout",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
-        "//pkg/kubectl/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config",
-        "//pkg/kubectl/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout",
-        "//pkg/kubectl/cmd/util/editor",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor",
     ],
 )
 
@@ -403,12 +419,13 @@ package_group(
     packages = [
         "//pkg/kubectl",
         "//pkg/kubectl/cmd",
-        "//pkg/kubectl/cmd/apply",
         "//pkg/kubectl/cmd/convert",
-        "//pkg/kubectl/cmd/replace",
+        "//staging/src/k8s.io/kubectl/pkg/cmd",
-        "//pkg/kubectl/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply",
-        "//pkg/kubectl/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace",
-        "//pkg/kubectl/cmd/util",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util",
     ],
 )
 

go.mod

@@ -44,7 +44,6 @@ require (
 	github.com/cpuguy83/go-md2man v1.0.10
 	github.com/cyphar/filepath-securejoin v0.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1
-	github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
 	github.com/docker/go-connections v0.3.0
@@ -66,9 +65,6 @@ require (
 	github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
 	github.com/golang/mock v1.2.0
 	github.com/golang/protobuf v1.2.0
-	github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
-	github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
-	github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
 	github.com/google/cadvisor v0.33.2-0.20190411163913-9db8c7dee20a
 	github.com/google/certificate-transparency-go v1.0.21 // indirect
 	github.com/google/go-cmp v0.3.0
@@ -82,7 +78,6 @@ require (
 	github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413 // indirect
 	github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 // indirect
 	github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64 // indirect
-	github.com/jonboulle/clockwork v0.1.0
 	github.com/json-iterator/go v1.1.6
 	github.com/karrick/godirwalk v1.7.5 // indirect
 	github.com/libopenstorage/openstorage v1.0.0
@@ -176,7 +171,6 @@ require (
 	k8s.io/repo-infra v0.0.0-20181204233714-00fe14e3d1a3
 	k8s.io/sample-apiserver v0.0.0
 	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
-	sigs.k8s.io/kustomize v2.0.3+incompatible
 	sigs.k8s.io/yaml v1.1.0
 	vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc
 )

hack/.golint_failures

@@ -107,37 +107,8 @@ pkg/credentialprovider/gcp
 pkg/features
 pkg/kubeapiserver
 pkg/kubeapiserver/options
-pkg/kubectl/cmd/annotate
-pkg/kubectl/cmd/apply
-pkg/kubectl/cmd/attach
-pkg/kubectl/cmd/autoscale
-pkg/kubectl/cmd/certificates
-pkg/kubectl/cmd/clusterinfo
 pkg/kubectl/cmd/convert
-pkg/kubectl/cmd/create
-pkg/kubectl/cmd/delete
-pkg/kubectl/cmd/describe
-pkg/kubectl/cmd/diff
-pkg/kubectl/cmd/drain
-pkg/kubectl/cmd/exec
-pkg/kubectl/cmd/explain
-pkg/kubectl/cmd/expose
 pkg/kubectl/cmd/get
-pkg/kubectl/cmd/label
-pkg/kubectl/cmd/logs
-pkg/kubectl/cmd/patch
-pkg/kubectl/cmd/plugin
-pkg/kubectl/cmd/portforward
-pkg/kubectl/cmd/replace
-pkg/kubectl/cmd/rollingupdate
-pkg/kubectl/cmd/rollout
-pkg/kubectl/cmd/run
-pkg/kubectl/cmd/scale
-pkg/kubectl/cmd/set
-pkg/kubectl/cmd/taint
-pkg/kubectl/cmd/testing
-pkg/kubectl/cmd/top
-pkg/kubectl/cmd/wait
 pkg/kubelet
 pkg/kubelet/apis/config
 pkg/kubelet/apis/config/v1beta1
@@ -531,7 +502,37 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
 staging/src/k8s.io/kube-aggregator/pkg/apiserver
 staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
 staging/src/k8s.io/kube-proxy/config/v1alpha1
+staging/src/k8s.io/kubectl/pkg/cmd
+staging/src/k8s.io/kubectl/pkg/cmd/annotate
+staging/src/k8s.io/kubectl/pkg/cmd/apply
+staging/src/k8s.io/kubectl/pkg/cmd/attach
+staging/src/k8s.io/kubectl/pkg/cmd/autoscale
+staging/src/k8s.io/kubectl/pkg/cmd/certificates
+staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo
+staging/src/k8s.io/kubectl/pkg/cmd/create
+staging/src/k8s.io/kubectl/pkg/cmd/delete
+staging/src/k8s.io/kubectl/pkg/cmd/describe
+staging/src/k8s.io/kubectl/pkg/cmd/diff
+staging/src/k8s.io/kubectl/pkg/cmd/drain
+staging/src/k8s.io/kubectl/pkg/cmd/exec
+staging/src/k8s.io/kubectl/pkg/cmd/explain
+staging/src/k8s.io/kubectl/pkg/cmd/expose
+staging/src/k8s.io/kubectl/pkg/cmd/label
+staging/src/k8s.io/kubectl/pkg/cmd/logs
+staging/src/k8s.io/kubectl/pkg/cmd/patch
+staging/src/k8s.io/kubectl/pkg/cmd/plugin
+staging/src/k8s.io/kubectl/pkg/cmd/portforward
+staging/src/k8s.io/kubectl/pkg/cmd/replace
+staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate
+staging/src/k8s.io/kubectl/pkg/cmd/rollout
+staging/src/k8s.io/kubectl/pkg/cmd/run
+staging/src/k8s.io/kubectl/pkg/cmd/scale
+staging/src/k8s.io/kubectl/pkg/cmd/set
+staging/src/k8s.io/kubectl/pkg/cmd/taint
+staging/src/k8s.io/kubectl/pkg/cmd/testing
+staging/src/k8s.io/kubectl/pkg/cmd/top
 staging/src/k8s.io/kubectl/pkg/cmd/util
+staging/src/k8s.io/kubectl/pkg/cmd/wait
 staging/src/k8s.io/kubectl/pkg/describe/versioned
 staging/src/k8s.io/kubectl/pkg/generate
 staging/src/k8s.io/kubectl/pkg/generate/versioned

pkg/kubectl/cmd/BUILD

@@ -1,81 +1,66 @@
-load(
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-    "go_test",
-)
 
 go_library(
     name = "go_default_library",
-    srcs = [
+    srcs = ["cmd.go"],
-        "alpha.go",
-        "cmd.go",
-        "profiling.go",
-    ],
     importpath = "k8s.io/kubernetes/pkg/kubectl/cmd",
-    visibility = [
+    visibility = ["//visibility:public"],
-        "//build/visible_to:pkg_kubectl_cmd_CONSUMERS",
-    ],
     deps = [
-        "//pkg/kubectl/cmd/annotate:go_default_library",
-        "//pkg/kubectl/cmd/apiresources:go_default_library",
-        "//pkg/kubectl/cmd/apply:go_default_library",
-        "//pkg/kubectl/cmd/attach:go_default_library",
         "//pkg/kubectl/cmd/auth:go_default_library",
-        "//pkg/kubectl/cmd/autoscale:go_default_library",
-        "//pkg/kubectl/cmd/certificates:go_default_library",
-        "//pkg/kubectl/cmd/clusterinfo:go_default_library",
-        "//pkg/kubectl/cmd/completion:go_default_library",
-        "//pkg/kubectl/cmd/config:go_default_library",
         "//pkg/kubectl/cmd/convert:go_default_library",
-        "//pkg/kubectl/cmd/cp:go_default_library",
-        "//pkg/kubectl/cmd/create:go_default_library",
-        "//pkg/kubectl/cmd/delete:go_default_library",
-        "//pkg/kubectl/cmd/describe:go_default_library",
-        "//pkg/kubectl/cmd/diff:go_default_library",
-        "//pkg/kubectl/cmd/drain:go_default_library",
-        "//pkg/kubectl/cmd/edit:go_default_library",
-        "//pkg/kubectl/cmd/exec:go_default_library",
-        "//pkg/kubectl/cmd/explain:go_default_library",
-        "//pkg/kubectl/cmd/expose:go_default_library",
         "//pkg/kubectl/cmd/get:go_default_library",
-        "//pkg/kubectl/cmd/kustomize:go_default_library",
-        "//pkg/kubectl/cmd/label:go_default_library",
-        "//pkg/kubectl/cmd/logs:go_default_library",
-        "//pkg/kubectl/cmd/options:go_default_library",
-        "//pkg/kubectl/cmd/patch:go_default_library",
-        "//pkg/kubectl/cmd/plugin:go_default_library",
-        "//pkg/kubectl/cmd/portforward:go_default_library",
-        "//pkg/kubectl/cmd/proxy:go_default_library",
-        "//pkg/kubectl/cmd/replace:go_default_library",
-        "//pkg/kubectl/cmd/rollingupdate:go_default_library",
-        "//pkg/kubectl/cmd/rollout:go_default_library",
-        "//pkg/kubectl/cmd/run:go_default_library",
-        "//pkg/kubectl/cmd/scale:go_default_library",
-        "//pkg/kubectl/cmd/set:go_default_library",
-        "//pkg/kubectl/cmd/taint:go_default_library",
-        "//pkg/kubectl/cmd/top:go_default_library",
-        "//pkg/kubectl/cmd/version:go_default_library",
-        "//pkg/kubectl/cmd/wait:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/component-base/cli/flag:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/annotate:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/completion:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/cp:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/describe:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/diff:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/drain:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/explain:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/expose:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/label:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/options:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/patch:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/plugin:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/portforward:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/proxy:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/run:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/scale:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/taint:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/version:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/wait:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
-        "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["cmd_test.go"],
-    data = [
+    data = ["//pkg/kubectl/cmd/plugin/testdata"],
-        "//api/openapi-spec",
-        "//pkg/kubectl/cmd/plugin:testdata",
-        "//test/e2e/testing-manifests:all-srcs",
-        "//test/fixtures",
-    ],
     embed = [":go_default_library"],
     deps = [
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
@@ -87,57 +72,18 @@ filegroup(
     name = "package-srcs",
     srcs = glob(["**"]),
     tags = ["automanaged"],
+    visibility = ["//visibility:private"],
 )
 
 filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/kubectl/cmd/annotate:all-srcs",
-        "//pkg/kubectl/cmd/apiresources:all-srcs",
-        "//pkg/kubectl/cmd/apply:all-srcs",
-        "//pkg/kubectl/cmd/attach:all-srcs",
         "//pkg/kubectl/cmd/auth:all-srcs",
-        "//pkg/kubectl/cmd/autoscale:all-srcs",
-        "//pkg/kubectl/cmd/certificates:all-srcs",
-        "//pkg/kubectl/cmd/clusterinfo:all-srcs",
-        "//pkg/kubectl/cmd/completion:all-srcs",
-        "//pkg/kubectl/cmd/config:all-srcs",
         "//pkg/kubectl/cmd/convert:all-srcs",
-        "//pkg/kubectl/cmd/cp:all-srcs",
-        "//pkg/kubectl/cmd/create:all-srcs",
-        "//pkg/kubectl/cmd/delete:all-srcs",
-        "//pkg/kubectl/cmd/describe:all-srcs",
-        "//pkg/kubectl/cmd/diff:all-srcs",
-        "//pkg/kubectl/cmd/drain:all-srcs",
-        "//pkg/kubectl/cmd/edit:all-srcs",
-        "//pkg/kubectl/cmd/exec:all-srcs",
-        "//pkg/kubectl/cmd/explain:all-srcs",
-        "//pkg/kubectl/cmd/expose:all-srcs",
         "//pkg/kubectl/cmd/get:all-srcs",
-        "//pkg/kubectl/cmd/help:all-srcs",
+        "//pkg/kubectl/cmd/plugin/testdata:all-srcs",
-        "//pkg/kubectl/cmd/kustomize:all-srcs",
-        "//pkg/kubectl/cmd/label:all-srcs",
-        "//pkg/kubectl/cmd/logs:all-srcs",
-        "//pkg/kubectl/cmd/options:all-srcs",
-        "//pkg/kubectl/cmd/patch:all-srcs",
-        "//pkg/kubectl/cmd/plugin:all-srcs",
-        "//pkg/kubectl/cmd/portforward:all-srcs",
-        "//pkg/kubectl/cmd/proxy:all-srcs",
-        "//pkg/kubectl/cmd/replace:all-srcs",
-        "//pkg/kubectl/cmd/rollingupdate:all-srcs",
-        "//pkg/kubectl/cmd/rollout:all-srcs",
-        "//pkg/kubectl/cmd/run:all-srcs",
-        "//pkg/kubectl/cmd/scale:all-srcs",
-        "//pkg/kubectl/cmd/set:all-srcs",
-        "//pkg/kubectl/cmd/taint:all-srcs",
-        "//pkg/kubectl/cmd/testing:all-srcs",
-        "//pkg/kubectl/cmd/top:all-srcs",
-        "//pkg/kubectl/cmd/version:all-srcs",
-        "//pkg/kubectl/cmd/wait:all-srcs",
     ],
     tags = ["automanaged"],
-    visibility = [
+    visibility = ["//visibility:public"],
-        "//build/visible_to:pkg_kubectl_cmd_CONSUMERS",
-    ],
 )

pkg/kubectl/cmd/auth/BUILD

@@ -63,13 +63,13 @@ go_test(
     srcs = ["cani_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/authorization/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
     ],
 )

pkg/kubectl/cmd/auth/cani_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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestRunAccessCheck(t *testing.T) {

pkg/kubectl/cmd/cmd.go

@@ -30,51 +30,52 @@ import (
 
 	"k8s.io/client-go/tools/clientcmd"
 	cliflag "k8s.io/component-base/cli/flag"
+	cmdpkg "k8s.io/kubectl/pkg/cmd"
+	"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 (
@@ -445,10 +446,10 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 		// Hook before and after Run initialize and write profiles to disk,
 		// respectively.
 		PersistentPreRunE: func(*cobra.Command, []string) error {
-			return initProfiling()
+			return cmdpkg.InitProfiling()
 		},
 		PersistentPostRunE: func(*cobra.Command, []string) error {
-			return flushProfiling()
+			return cmdpkg.FlushProfiling()
 		},
 		BashCompletionFunction: bashCompletionFunc,
 	}
@@ -460,7 +461,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	// a.k.a. change all "_" to "-". e.g. glog package
 	flags.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
 
-	addProfilingFlags(flags)
+	cmdpkg.AddProfilingFlags(flags)
 
 	kubeConfigFlags := genericclioptions.NewConfigFlags(true).WithDeprecatedPasswordFlag()
 	kubeConfigFlags.AddFlags(flags)
@@ -562,7 +563,7 @@ func NewKubectlCommand(in io.Reader, out, err io.Writer) *cobra.Command {
 	filters := []string{"options"}
 
 	// Hide the "alpha" subcommand if there are no alpha commands in this build.
-	alpha := NewCmdAlpha(f, ioStreams)
+	alpha := cmdpkg.NewCmdAlpha(f, ioStreams)
 	if !alpha.HasSubCommands() {
 		filters = append(filters, alpha.Name())
 	}

pkg/kubectl/cmd/cmd_test.go

@@ -100,7 +100,7 @@ func TestKubectlCommandHandlesPlugins(t *testing.T) {
 			}
 
 			if pluginsHandler.executedPlugin != test.expectPlugin {
-				t.Fatalf("unexpected plugin execution: expedcted %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin)
+				t.Fatalf("unexpected plugin execution: expected %q, got %q", test.expectPlugin, pluginsHandler.executedPlugin)
 			}
 
 			if len(pluginsHandler.withArgs) != len(test.expectPluginArgs) {

pkg/kubectl/cmd/convert/BUILD

@@ -49,9 +49,9 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
     ],
 )
 

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 {

pkg/kubectl/cmd/get/BUILD

@@ -81,7 +81,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
         "//staging/src/k8s.io/api/batch/v1:go_default_library",
@@ -102,6 +101,7 @@ go_test(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
         "//staging/src/k8s.io/client-go/rest/watch:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library",

pkg/kubectl/cmd/get/get_test.go

@@ -47,10 +47,10 @@ import (
 	"k8s.io/client-go/rest/fake"
 	restclientwatch "k8s.io/client-go/rest/watch"
 	"k8s.io/kube-openapi/pkg/util/proto"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"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"
 )
 
 var (

pkg/kubectl/cmd/plugin/testdata/BUILD

@@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
 filegroup(
-    name = "openapi",
+    name = "testdata",
     srcs = glob([
-        "**/*.json",
+        "**/*",
     ]),
 )
 

staging/publishing/import-restrictions.yaml

@@ -130,6 +130,7 @@
   - k8s.io/apimachinery
   - k8s.io/cli-runtime
   - k8s.io/client-go
+  - k8s.io/component-base
   - k8s.io/kubectl
   - k8s.io/kube-openapi
   - k8s.io/metrics

staging/publishing/rules.yaml

@@ -628,6 +628,8 @@ rules:
       branch: master
     - repository: code-generator
       branch: master
+    - repository: component-base
+      branch: master
     - repository: metrics
       branch: master
   - source:
@@ -644,5 +646,7 @@ rules:
       branch: release-12.0
     - repository: code-generator
       branch: release-1.15
+    - repository: component-base
+      branch: release-1.15      
     - repository: metrics
       branch: release-1.15

staging/src/k8s.io/kubectl/BUILD

@@ -11,7 +11,7 @@ filegroup(
         ":package-srcs",
         "//staging/src/k8s.io/kubectl/pkg/apply:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/apps:all-srcs",
-        "//staging/src/k8s.io/kubectl/pkg/cmd/util:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/describe:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/drain:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/explain:all-srcs",
@@ -26,7 +26,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/util:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/validation:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/version:all-srcs",
-        "//staging/src/k8s.io/kubectl/test/data/openapi:all-srcs",
+        "//staging/src/k8s.io/kubectl/test/data:all-srcs",
     ],
     tags = ["automanaged"],
     visibility = ["//visibility:public"],

staging/src/k8s.io/kubectl/go.mod

@@ -8,20 +8,30 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
 	github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5
+	github.com/davecgh/go-spew v1.1.1
+	github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd
+	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0
 	github.com/evanphx/json-patch v4.2.0+incompatible
 	github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
 	github.com/fatih/camelcase v1.0.0
 	github.com/go-openapi/spec v0.19.2
+	github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
+	github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
+	github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e // indirect
 	github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d
+	github.com/jonboulle/clockwork v0.1.0
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
+	github.com/lithammer/dedent v1.1.0
 	github.com/mitchellh/go-wordwrap v1.0.0
 	github.com/onsi/ginkgo v1.8.0
 	github.com/onsi/gomega v1.5.0
+	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/russross/blackfriday v1.5.2
 	github.com/sirupsen/logrus v1.4.2 // indirect
 	github.com/spf13/cobra v0.0.4
 	github.com/spf13/pflag v1.0.3
+	github.com/stretchr/testify v1.3.0
 	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
 	gopkg.in/yaml.v2 v2.2.2
 	gotest.tools v2.2.0+incompatible // indirect
@@ -29,10 +39,12 @@ require (
 	k8s.io/apimachinery v0.0.0
 	k8s.io/cli-runtime v0.0.0
 	k8s.io/client-go v0.0.0
+	k8s.io/component-base v0.0.0
 	k8s.io/klog v0.3.1
 	k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058
 	k8s.io/metrics v0.0.0
 	k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a
+	sigs.k8s.io/kustomize v2.0.3+incompatible
 	sigs.k8s.io/yaml v1.1.0
 )
 
@@ -48,6 +60,7 @@ replace (
 	k8s.io/cli-runtime => ../cli-runtime
 	k8s.io/client-go => ../client-go
 	k8s.io/code-generator => ../code-generator
+	k8s.io/component-base => ../component-base
 	k8s.io/kubectl => ../kubectl
 	k8s.io/metrics => ../metrics
 )

staging/src/k8s.io/kubectl/go.sum

@@ -14,6 +14,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8=
 github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -24,7 +26,11 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd h1:uVsMphB1eRx7xB1njzL3fuMdWRN8HtVzoUOItHMwv5c=
+github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
+github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 h1:w3NnFcKR5241cfmQU5ZZAsf0xcpId6mWOupTvJlUX2U=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg=
@@ -64,6 +70,12 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 h1:7xqw01UYS+KCI25bMrPxwNYkSns2Db1ziQPpVq99FpE=
+github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 h1:f5gsjBiF9tRRVomCvrkGMMWI8W1f2OBFar2c5oakAP0=
+github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e h1:KhcknUwkWHKZPbFy2P7jH5LKJ3La+0ZeknkkmrSgqb0=
+github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk=
 github.com/google/btree v0.0.0-20160524151835-7d79101e329e h1:JHB7F/4TJCrYBW8+GZO8VkWDj1jxcWuCl6uxKODiyi4=
 github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
@@ -87,6 +99,8 @@ github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.6 h1:MrUvLMLTMxbqFJ9kzlvat/rYZqZnW3u4wkLzWTaFwKs=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -102,10 +116,13 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
+github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
@@ -125,6 +142,8 @@ github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ=
+github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -133,6 +152,10 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD

@@ -33,7 +33,7 @@ go_test(
     ],
     data = [
         "test_swagger.json",
-        "//staging/src/k8s.io/kubectl/test/data/openapi",
+        "//staging/src/k8s.io/kubectl/test/data",
     ],
     embed = [":go_default_library"],
     deps = [

staging/src/k8s.io/kubectl/pkg/cmd/BUILD

@@ -0,0 +1,77 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "alpha.go",
+        "profiling.go",
+    ],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd",
+    importpath = "k8s.io/kubectl/pkg/cmd",
+    visibility = [
+        "//build/visible_to:pkg_kubectl_cmd_CONSUMERS",
+    ],
+    deps = [
+        "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
+        "//vendor/github.com/spf13/cobra:go_default_library",
+        "//vendor/github.com/spf13/pflag:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/annotate:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apiresources:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/apply:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/attach:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/autoscale:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/certificates:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/completion:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/config:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/cp:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/create:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/describe:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/diff:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/drain:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/edit:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/explain:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/expose:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/help:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/kustomize:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/label:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/logs:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/options:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/patch:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/plugin:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/portforward:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/proxy:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/replace:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/rollout:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/run:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/scale:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/set:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/taint:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/top:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/version:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/wait:all-srcs",
+    ],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)

staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["annotate.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/annotate",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/annotate",
+    importpath = "k8s.io/kubectl/pkg/cmd/annotate",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
@@ -28,12 +29,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["annotate_test.go"],
-    data = [
+    data = ["//staging/src/k8s.io/kubectl/test/data"],
-        "//test/e2e/testing-manifests:all-srcs",
-    ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -41,6 +39,7 @@ go_test(
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
     ],
 )

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestValidateAnnotationOverwrites(t *testing.T) {
@@ -543,7 +543,7 @@ func TestAnnotateObjectFromFile(t *testing.T) {
 	cmd := NewCmdAnnotate("kubectl", tf, iostreams)
 	cmd.SetOutput(bufOut)
 	options := NewAnnotateOptions(iostreams)
-	options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}
+	options.Filenames = []string{"../../../test/data/controller.yaml"}
 	args := []string{"a=b", "c-"}
 	if err := options.Complete(tf, cmd, args); err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -574,7 +574,7 @@ func TestAnnotateLocal(t *testing.T) {
 	cmd := NewCmdAnnotate("kubectl", tf, iostreams)
 	options := NewAnnotateOptions(iostreams)
 	options.local = true
-	options.Filenames = []string{"../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml"}
+	options.Filenames = []string{"../../../test/data/controller.yaml"}
 	args := []string{"a=b"}
 	if err := options.Complete(tf, cmd, args); err != nil {
 		t.Fatalf("unexpected error: %v", err)

staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD

@@ -6,7 +6,8 @@ go_library(
         "apiresources.go",
         "apiversions.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/apiresources",
+    importpath = "k8s.io/kubectl/pkg/cmd/apiresources",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD

@@ -8,10 +8,10 @@ go_library(
         "apply_set_last_applied.go",
         "apply_view_last_applied.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apply",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/apply",
+    importpath = "k8s.io/kubectl/pkg/cmd/apply",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/kubectl/cmd/delete:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
@@ -30,6 +30,7 @@ go_library(
         "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
         "//staging/src/k8s.io/client-go/discovery:go_default_library",
         "//staging/src/k8s.io/client-go/dynamic:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
@@ -49,13 +50,9 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["apply_test.go"],
-    data = [
+    data = ["//staging/src/k8s.io/kubectl/test/data"],
-        "//api/openapi-spec",
-        "//test/fixtures",
-    ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@@ -70,6 +67,7 @@ go_test(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library",

staging/src/k8s.io/kubectl/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/kubernetes/pkg/kubectl/cmd/delete"
 )
 
 // ApplyOptions defines flags and other configuration parameters for the `apply` command

staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go

@@ -46,15 +46,15 @@ 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/kubernetes/pkg/kubectl/cmd/testing"
 	utilpointer "k8s.io/utils/pointer"
 )
 
 var (
-	fakeSchema                 = sptest.Fake{Path: filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json")}
+	fakeSchema                 = sptest.Fake{Path: filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")}
 	testingOpenAPISchemaFns    = []func() (openapi.Resources, error){nil, AlwaysErrorOpenAPISchemaFn, openAPISchemaFn}
 	AlwaysErrorOpenAPISchemaFn = func() (openapi.Resources, error) {
 		return nil, errors.New("cannot get openapi spec")
@@ -87,23 +87,23 @@ func validateApplyArgs(cmd *cobra.Command, args []string) error {
 }
 
 const (
-	filenameCM                = "../../../../test/fixtures/pkg/kubectl/cmd/apply/cm.yaml"
+	filenameCM                = "../../../test/data/apply/cm.yaml"
-	filenameRC                = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.yaml"
+	filenameRC                = "../../../test/data/apply/rc.yaml"
-	filenameRCArgs            = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-args.yaml"
+	filenameRCArgs            = "../../../test/data/apply/rc-args.yaml"
-	filenameRCLastAppliedArgs = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied-args.yaml"
+	filenameRCLastAppliedArgs = "../../../test/data/apply/rc-lastapplied-args.yaml"
-	filenameRCNoAnnotation    = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-no-annotation.yaml"
+	filenameRCNoAnnotation    = "../../../test/data/apply/rc-no-annotation.yaml"
-	filenameRCLASTAPPLIED     = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-lastapplied.yaml"
+	filenameRCLASTAPPLIED     = "../../../test/data/apply/rc-lastapplied.yaml"
-	filenameSVC               = "../../../../test/fixtures/pkg/kubectl/cmd/apply/service.yaml"
+	filenameSVC               = "../../../test/data/apply/service.yaml"
-	filenameRCSVC             = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-service.yaml"
+	filenameRCSVC             = "../../../test/data/apply/rc-service.yaml"
-	filenameNoExistRC         = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc-noexist.yaml"
+	filenameNoExistRC         = "../../../test/data/apply/rc-noexist.yaml"
-	filenameRCPatchTest       = "../../../../test/fixtures/pkg/kubectl/cmd/apply/patch.json"
+	filenameRCPatchTest       = "../../../test/data/apply/patch.json"
-	dirName                   = "../../../../test/fixtures/pkg/kubectl/cmd/apply/testdir"
+	dirName                   = "../../../test/data/apply/testdir"
-	filenameRCJSON            = "../../../../test/fixtures/pkg/kubectl/cmd/apply/rc.json"
+	filenameRCJSON            = "../../../test/data/apply/rc.json"
 
-	filenameWidgetClientside    = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-clientside.yaml"
+	filenameWidgetClientside    = "../../../test/data/apply/widget-clientside.yaml"
-	filenameWidgetServerside    = "../../../../test/fixtures/pkg/kubectl/cmd/apply/widget-serverside.yaml"
+	filenameWidgetServerside    = "../../../test/data/apply/widget-serverside.yaml"
-	filenameDeployObjServerside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml"
+	filenameDeployObjServerside = "../../../test/data/apply/deploy-serverside.yaml"
-	filenameDeployObjClientside = "../../../../test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml"
+	filenameDeployObjClientside = "../../../test/data/apply/deploy-clientside.yaml"
 )
 
 func readConfigMapList(t *testing.T, filename string) [][]byte {

staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD

@@ -3,16 +3,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["attach.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/attach",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/attach",
+    importpath = "k8s.io/kubectl/pkg/cmd/attach",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/kubectl/cmd/exec:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
@@ -28,8 +29,6 @@ go_test(
     srcs = ["attach_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/exec:go_default_library",
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -38,6 +37,8 @@ go_test(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
         "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
     ],

staging/src/k8s.io/kubectl/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/kubernetes/pkg/kubectl/cmd/exec"
 )
 
 var (

staging/src/k8s.io/kubectl/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/cmd/exec"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"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"
 )
 
 type fakeRemoteAttach struct {

staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["autoscale.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/autoscale",
+    importpath = "k8s.io/kubectl/pkg/cmd/autoscale",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",

staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["certificates.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/certificates",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/certificates",
+    importpath = "k8s.io/kubectl/pkg/cmd/certificates",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",

staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD

@@ -6,7 +6,8 @@ go_library(
         "clusterinfo.go",
         "clusterinfo_dump.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/clusterinfo",
+    importpath = "k8s.io/kubectl/pkg/cmd/clusterinfo",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -33,8 +34,8 @@ go_test(
     srcs = ["clusterinfo_dump_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
     ],
 )
 

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) {

staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["completion.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/completion",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/completion",
+    importpath = "k8s.io/kubectl/pkg/cmd/completion",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",

staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD

@@ -23,7 +23,8 @@ go_library(
         "use_context.go",
         "view.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/config",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/config",
+    importpath = "k8s.io/kubectl/pkg/cmd/config",
     visibility = [
         "//build/visible_to:pkg_kubectl_cmd_config_CONSUMERS",
     ],

staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD

@@ -3,13 +3,14 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["cp.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/cp",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/cp",
+    importpath = "k8s.io/kubectl/pkg/cmd/cp",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/kubectl/cmd/exec:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library",
@@ -23,14 +24,14 @@ go_test(
     srcs = ["cp_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/exec:go_default_library",
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/github.com/stretchr/testify/require:go_default_library",

staging/src/k8s.io/kubectl/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/kubernetes/pkg/kubectl/cmd/exec"
 
 	"bytes"
 

staging/src/k8s.io/kubectl/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"
+	kexec "k8s.io/kubectl/pkg/cmd/exec"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	kexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 type FileType int

staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD

@@ -20,7 +20,8 @@ go_library(
         "create_service.go",
         "create_serviceaccount.go",
     ],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/create",
+    importpath = "k8s.io/kubectl/pkg/cmd/create",
     visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"],
     deps = [
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
@@ -76,12 +77,9 @@ go_test(
         "create_serviceaccount_test.go",
         "create_test.go",
     ],
-    data = [
+    data = ["//staging/src/k8s.io/kubectl/test/data"],
-        "//test/e2e/testing-manifests:all-srcs",
-    ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/testing:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/batch/v1:go_default_library",
         "//staging/src/k8s.io/api/batch/v1beta1:go_default_library",
@@ -97,6 +95,7 @@ go_test(
         "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/rest/fake:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreateClusterRole(t *testing.T) {

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreateClusterRoleBinding(t *testing.T) {

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreateConfigMap(t *testing.T) {

staging/src/k8s.io/kubectl/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/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func Test_generatorFromName(t *testing.T) {

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreateNamespace(t *testing.T) {

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreatePdb(t *testing.T) {

staging/src/k8s.io/kubectl/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"
+	cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
 	"k8s.io/kubectl/pkg/scheme"
-	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 )
 
 func TestCreatePriorityClass(t *testing.T) {