diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index c446cc37915..2f71fa1cabf 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -84,12 +84,13 @@ package_group( "//cmd/kubectl/app", "//pkg/kubectl/cmd", "//pkg/kubectl/cmd/auth", - "//pkg/kubectl/cmd/config", - "//pkg/kubectl/cmd/rollout", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//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", ], ) @@ -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", - "//pkg/kubectl/cmd/label", - "//pkg/kubectl/cmd/logs", - "//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/testing", - "//pkg/kubectl/cmd/top", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", - "//pkg/kubectl/cmd/util/sanity", - "//pkg/kubectl/cmd/version", - "//pkg/kubectl/cmd/wait", + "//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/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", - "//pkg/kubectl/cmd/create", - "//pkg/kubectl/cmd/edit", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//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", - "//pkg/kubectl/cmd/set", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", - "//pkg/kubectl/cmd/util/editor", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/config", + "//staging/src/k8s.io/kubectl/pkg/cmd/create", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollout", + "//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", - "//pkg/kubectl/cmd/rollingupdate", - "//pkg/kubectl/cmd/testing", - "//pkg/kubectl/cmd/util", + "//staging/src/k8s.io/kubectl/pkg/cmd", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply", + "//staging/src/k8s.io/kubectl/pkg/cmd/replace", + "//staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing", + "//staging/src/k8s.io/kubectl/pkg/cmd/util", ], ) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD new file mode 100644 index 00000000000..f92760a7de4 --- /dev/null +++ b/pkg/kubectl/cmd/BUILD @@ -0,0 +1,87 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["cmd.go"], + importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", + visibility = ["//visibility:public"], + deps = [ + "//pkg/kubectl/cmd/auth:go_default_library", + "//pkg/kubectl/cmd/convert:go_default_library", + "//pkg/kubectl/cmd/get: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", + ], +) + +go_test( + name = "go_default_test", + srcs = ["cmd_test.go"], + embed = [":go_default_library"], + deps = [ + "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + ], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [ + ":package-srcs", + "//pkg/kubectl/cmd/auth:all-srcs", + "//pkg/kubectl/cmd/convert:all-srcs", + "//pkg/kubectl/cmd/get:all-srcs", + ], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index 3027fc855f5..fc2242791b2 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/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", ], ) diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 234522e873e..983515088a0 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -30,6 +30,7 @@ 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" @@ -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()) } diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD index 49be53e9580..a7e95ca51f1 100644 --- a/pkg/kubectl/cmd/convert/BUILD +++ b/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", ], ) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 813d6793b6c..80f39d71715 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 751294d37ca..a8ffb840cc8 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index a784682e130..90b67c34de0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -1,64 +1,18 @@ -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = [ "alpha.go", - "cmd.go", "profiling.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", + 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 = [ - "//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/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", @@ -67,22 +21,6 @@ go_library( ], ) -go_test( - name = "go_default_test", - srcs = ["cmd_test.go"], - data = [ - "//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", - "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", - ], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), @@ -93,51 +31,47 @@ 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/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", + "//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 = [ - "//build/visible_to:pkg_kubectl_cmd_CONSUMERS", - ], + visibility = ["//visibility:public"], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD index 09c1da8aa86..93411fd9a11 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/annotate/BUILD +++ b/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", @@ -33,7 +34,6 @@ go_test( ], 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 +41,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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD index 739ed775e89..6898831622a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD index 058383f879a..ee84fd248c7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/BUILD +++ b/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", @@ -55,7 +56,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/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -70,6 +70,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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD index e91ad66356a..feac0f93be3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/attach/BUILD +++ b/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", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD index 835baf4801c..dfc6fc8d15f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/autoscale/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD index b6736d224d0..eb57f661a3d 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/certificates/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD index 4aa0093ad36..8d59ecc5a3a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/BUILD +++ b/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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD index 67c2b6670a1..ab02c57527c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/completion/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD index 2db61ef70b3..98f9ecb49e3 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD +++ b/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", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD index d310eb1457a..0b3bfcb57aa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD +++ b/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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD index 93f206ce6ed..ef40a36347c 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/BUILD +++ b/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", @@ -81,7 +82,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/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", @@ -97,6 +97,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", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD index fa2e1a00838..2c55d5e5491 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/BUILD @@ -6,10 +6,10 @@ go_library( "delete.go", "delete_flags.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/delete", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/delete", + importpath = "k8s.io/kubectl/pkg/cmd/delete", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/wait: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -19,6 +19,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/wait:go_default_library", "//staging/src/k8s.io/kubectl/pkg/rawhttp: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", @@ -35,13 +36,13 @@ go_test( ], 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/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1: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/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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD index 4134f50ceea..374022d3fb4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/describe/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["describe.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/describe", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/describe", + importpath = "k8s.io/kubectl/pkg/cmd/describe", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -29,11 +30,11 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta: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/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/testing:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD index 72f234a2c3a..37792f9a508 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/diff/BUILD @@ -3,10 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["diff.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/diff", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/diff", + importpath = "k8s.io/kubectl/pkg/cmd/diff", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/apply: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -17,6 +17,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/apply: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:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD index 40289f4471d..8dc7fbdf546 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/drain/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["drain.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/drain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/drain", + importpath = "k8s.io/kubectl/pkg/cmd/drain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -31,7 +32,6 @@ go_test( srcs = ["drain_test.go"], 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/core/v1:go_default_library", @@ -46,6 +46,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/printers: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/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/drain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD index 9f221c89e30..b92f632ec00 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["edit.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/edit", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/edit", + importpath = "k8s.io/kubectl/pkg/cmd/edit", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -19,19 +20,19 @@ go_test( name = "go_default_test", srcs = ["edit_test.go"], data = [ - "//pkg/kubectl/cmd/edit/testdata:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata:all-srcs", ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/apply:go_default_library", - "//pkg/kubectl/cmd/create:go_default_library", - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets: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/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/apply:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/create: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/gopkg.in/yaml.v2:go_default_library", @@ -49,7 +50,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/edit/testdata:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD index 6d03cb77a3f..e9aa714efa5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/edit/testdata/BUILD @@ -13,7 +13,8 @@ go_binary( go_library( name = "go_default_library", srcs = ["record.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/edit/testdata", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/edit/testdata", + importpath = "k8s.io/kubectl/pkg/cmd/edit/testdata", visibility = ["//visibility:private"], deps = ["//vendor/gopkg.in/yaml.v2:go_default_library"], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD index c16cb12859a..d30e3efeaf7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/exec/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["exec.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/exec", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/exec", + importpath = "k8s.io/kubectl/pkg/cmd/exec", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -30,7 +31,6 @@ go_test( srcs = ["exec_test.go"], 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/schema:go_default_library", @@ -38,6 +38,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/tools/remotecommand: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/term:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD index 78f2ce4c00f..62a468576f2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/explain/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["explain.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/explain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/explain", + importpath = "k8s.io/kubectl/pkg/cmd/explain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD index 2bf667ce314..99580a2bc75 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/expose/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["expose.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/expose", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/expose", + importpath = "k8s.io/kubectl/pkg/cmd/expose", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -37,7 +38,6 @@ go_test( ], 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", @@ -45,6 +45,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/intstr: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", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD index 89dde353621..bef8cd52360 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/help/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["help.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/help", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/help", + importpath = "k8s.io/kubectl/pkg/cmd/help", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD index 2a0d2635722..dfed10869b4 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/kustomize/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["kustomize.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/kustomize", + importpath = "k8s.io/kubectl/pkg/cmd/kustomize", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD index 81af6640205..28f8112f6eb 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["label.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/label", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/label", + importpath = "k8s.io/kubectl/pkg/cmd/label", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -35,13 +36,13 @@ go_test( ], 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", "//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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD index afbc39176bc..101b9c42082 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/logs/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["logs.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/logs", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/logs", + importpath = "k8s.io/kubectl/pkg/cmd/logs", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -26,12 +27,12 @@ go_test( srcs = ["logs_test.go"], 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", "//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/kubectl/pkg/cmd/testing:go_default_library", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD index 7b4a8e99c01..f9f0dfdee29 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/options/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["options.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/options", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/options", + importpath = "k8s.io/kubectl/pkg/cmd/options", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD index fc2625783c9..fad8f8c7c05 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/patch/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["patch.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/patch", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/patch", + importpath = "k8s.io/kubectl/pkg/cmd/patch", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -35,10 +36,10 @@ 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/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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD index b6948dfc02c..0ca4f4e62cc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["plugin.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/plugin", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/plugin", + importpath = "k8s.io/kubectl/pkg/cmd/plugin", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD index a34affa3534..93311f0a7c9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/portforward/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["portforward.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/portforward", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/portforward", + importpath = "k8s.io/kubectl/pkg/cmd/portforward", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -28,13 +29,13 @@ go_test( srcs = ["portforward_test.go"], 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/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr: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", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go index 2a1c1ce3c15..e1309835d21 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/profiling.go @@ -30,12 +30,12 @@ var ( profileOutput string ) -func addProfilingFlags(flags *pflag.FlagSet) { +func AddProfilingFlags(flags *pflag.FlagSet) { flags.StringVar(&profileName, "profile", "none", "Name of profile to capture. One of (none|cpu|heap|goroutine|threadcreate|block|mutex)") flags.StringVar(&profileOutput, "profile-output", "profile.pprof", "Name of the file to write the profile to") } -func initProfiling() error { +func InitProfiling() error { switch profileName { case "none": return nil @@ -63,7 +63,7 @@ func initProfiling() error { return nil } -func flushProfiling() error { +func FlushProfiling() error { switch profileName { case "none": return nil diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD index 6bd635e2008..e75fe8ab8f2 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/proxy/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["proxy.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/proxy", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/proxy", + importpath = "k8s.io/kubectl/pkg/cmd/proxy", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD index 689aa9e9f09..97b04ebda72 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/replace/BUILD @@ -3,15 +3,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["replace.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/replace", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/replace", + importpath = "k8s.io/kubectl/pkg/cmd/replace", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/delete: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/util/wait: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/kubectl/pkg/cmd/delete:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/rawhttp:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", @@ -32,11 +33,11 @@ go_test( ], 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/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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD index 731b9db6198..b66f81736d7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/BUILD @@ -6,7 +6,8 @@ go_library( "rolling_updater.go", "rollingupdate.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/rollingupdate", + importpath = "k8s.io/kubectl/pkg/cmd/rollingupdate", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -49,7 +50,6 @@ go_test( ], 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/api/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -65,6 +65,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/scale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD index fd7c4c4a76c..c876153c1b8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/rollout/BUILD @@ -15,12 +15,12 @@ go_library( "rollout_status.go", "rollout_undo.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/rollout", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/rollout", + importpath = "k8s.io/kubectl/pkg/cmd/rollout", visibility = [ "//build/visible_to:pkg_kubectl_cmd_rollout_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/set: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -36,6 +36,7 @@ go_library( "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/set: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", @@ -67,7 +68,6 @@ go_test( srcs = ["rollout_pause_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/testing:go_default_library", "//staging/src/k8s.io/api/extensions/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -75,6 +75,7 @@ go_test( "//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", ], ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD index c99c1094afc..553119b59f8 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/run/BUILD @@ -3,13 +3,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["run.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/run", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/run", + importpath = "k8s.io/kubectl/pkg/cmd/run", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/attach:go_default_library", - "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/logs: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", @@ -26,6 +23,10 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/attach:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/exec:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/logs:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", @@ -47,8 +48,6 @@ go_test( srcs = ["run_test.go"], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/cmd/delete: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/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -57,6 +56,8 @@ go_test( "//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/delete: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/i18n:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD index d01d30fc66b..79ec124e988 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/scale/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["scale.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/scale", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/scale", + importpath = "k8s.io/kubectl/pkg/cmd/scale", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD index a3dfe6ac9db..ded20d03740 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/BUILD @@ -16,10 +16,10 @@ go_library( "set_serviceaccount.go", "set_subject.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/set", + importpath = "k8s.io/kubectl/pkg/cmd/set", visibility = ["//build/visible_to:pkg_kubectl_cmd_set_CONSUMERS"], deps = [ - "//pkg/kubectl/cmd/set/env:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -34,6 +34,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/set/env:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", @@ -62,7 +63,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/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", @@ -78,6 +78,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/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", @@ -95,7 +96,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/cmd/set/env:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/set/env:all-srcs", ], tags = ["automanaged"], visibility = [ diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD index 167872b494e..8def5b594e0 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/set/env/BUILD @@ -7,7 +7,8 @@ go_library( "env_parse.go", "env_resolve.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/set/env", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/set/env", + importpath = "k8s.io/kubectl/pkg/cmd/set/env", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD index ac05619e50a..bc632caf807 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/taint/BUILD @@ -6,7 +6,8 @@ go_library( "taint.go", "utils.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/taint", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/taint", + importpath = "k8s.io/kubectl/pkg/cmd/taint", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -37,13 +38,13 @@ go_test( ], 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", "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch: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", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD index 3be364d3c9d..d31e50a57fa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/testing/BUILD @@ -8,7 +8,8 @@ go_library( "util.go", "zz_generated.deepcopy.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/testing", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/testing", + importpath = "k8s.io/kubectl/pkg/cmd/testing", visibility = ["//build/visible_to:pkg_kubectl_cmd_testing_CONSUMERS"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD index 9db81304218..f7ecd89e911 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/top/BUILD @@ -7,7 +7,8 @@ go_library( "top_node.go", "top_pod.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/top", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/top", + importpath = "k8s.io/kubectl/pkg/cmd/top", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -38,7 +39,6 @@ go_test( ], 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/api/resource:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -48,6 +48,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/metrics/pkg/apis/metrics/v1alpha1:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD index 296f037d7e1..f2acee5a66a 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/version/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["version.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/version", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/version", + importpath = "k8s.io/kubectl/pkg/cmd/version", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD index c87f2fd7287..b578bef26fa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/wait/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["wait.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/wait", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/wait", + importpath = "k8s.io/kubectl/pkg/cmd/wait", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",