diff --git a/cmd/BUILD b/cmd/BUILD index 8432bb4f70e..2da1a0ac88d 100644 --- a/cmd/BUILD +++ b/cmd/BUILD @@ -27,6 +27,7 @@ filegroup( "//cmd/kube-scheduler:all-srcs", "//cmd/kubeadm:all-srcs", "//cmd/kubectl:all-srcs", + "//cmd/kubectl-convert:all-srcs", "//cmd/kubelet:all-srcs", "//cmd/kubemark:all-srcs", "//cmd/linkcheck:all-srcs", diff --git a/cmd/clicheck/BUILD b/cmd/clicheck/BUILD index ab931819360..a8bff329b02 100644 --- a/cmd/clicheck/BUILD +++ b/cmd/clicheck/BUILD @@ -16,7 +16,7 @@ go_library( srcs = ["check_cli_conventions.go"], importpath = "k8s.io/kubernetes/cmd/clicheck", deps = [ - "//pkg/kubectl/cmd:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity:go_default_library", ], ) diff --git a/cmd/gendocs/BUILD b/cmd/gendocs/BUILD index 6b2af89afb8..5988ad15ece 100644 --- a/cmd/gendocs/BUILD +++ b/cmd/gendocs/BUILD @@ -17,7 +17,7 @@ go_library( importpath = "k8s.io/kubernetes/cmd/gendocs", deps = [ "//cmd/genutils:go_default_library", - "//pkg/kubectl/cmd:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library", "//vendor/github.com/spf13/cobra/doc:go_default_library", ], ) diff --git a/cmd/genman/BUILD b/cmd/genman/BUILD index b1d5687a430..2e372b5aae7 100644 --- a/cmd/genman/BUILD +++ b/cmd/genman/BUILD @@ -23,7 +23,7 @@ go_library( "//cmd/kube-scheduler/app:go_default_library", "//cmd/kubeadm/app/cmd:go_default_library", "//cmd/kubelet/app:go_default_library", - "//pkg/kubectl/cmd:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library", "//vendor/github.com/cpuguy83/go-md2man/v2/md2man:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/cmd/genyaml/BUILD b/cmd/genyaml/BUILD index b659a379622..d9313554a32 100644 --- a/cmd/genyaml/BUILD +++ b/cmd/genyaml/BUILD @@ -17,7 +17,7 @@ go_library( importpath = "k8s.io/kubernetes/cmd/genyaml", deps = [ "//cmd/genutils:go_default_library", - "//pkg/kubectl/cmd:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/gopkg.in/yaml.v2:go_default_library", diff --git a/cmd/kubectl-convert/BUILD b/cmd/kubectl-convert/BUILD new file mode 100644 index 00000000000..81d97a72154 --- /dev/null +++ b/cmd/kubectl-convert/BUILD @@ -0,0 +1,44 @@ +load( + "@io_bazel_rules_go//go:def.bzl", + "go_binary", + "go_library", +) +load("//staging/src/k8s.io/component-base/version:def.bzl", "version_x_defs") + +go_binary( + name = "kubectl", + embed = [":go_default_library"], + pure = "on", + visibility = ["//visibility:public"], + x_defs = version_x_defs(), +) + +go_library( + name = "go_default_library", + srcs = ["kubectl-convert.go"], + importpath = "k8s.io/kubernetes/cmd/kubectl-convert", + visibility = ["//visibility:private"], + deps = [ + "//pkg/kubectl/cmd/convert:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions: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/logs: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"], + tags = ["automanaged"], + visibility = [ + "//build/visible_to:cmd_kubectl_CONSUMERS", + ], +) diff --git a/cmd/kubectl/BUILD b/cmd/kubectl/BUILD index 0f6a8cd3cbb..e386c960327 100644 --- a/cmd/kubectl/BUILD +++ b/cmd/kubectl/BUILD @@ -19,9 +19,9 @@ go_library( importpath = "k8s.io/kubernetes/cmd/kubectl", visibility = ["//visibility:private"], deps = [ - "//pkg/kubectl/cmd:go_default_library", "//staging/src/k8s.io/client-go/plugin/pkg/client/auth: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/util/logs:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", ], diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 6689b6bb040..24b79143191 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -1,79 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "go_default_library", - srcs = [ - "cmd.go", - "profiling.go", - ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd", - visibility = ["//visibility:public"], - deps = [ - "//pkg/kubectl/cmd/convert: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/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/auth: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/debug: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/get: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/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", - "//staging/src/k8s.io/kubectl/pkg/util/term: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 = ["//pkg/kubectl/cmd/plugin/testdata"], - 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(["**"]), @@ -86,7 +10,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubectl/cmd/convert:all-srcs", - "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index 1b208e2b9dd..9c09bab8cbc 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -1,8 +1,12 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", - srcs = ["alpha.go"], + srcs = [ + "alpha.go", + "cmd.go", + "profiling.go", + ], importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd", importpath = "k8s.io/kubectl/pkg/cmd", visibility = [ @@ -10,11 +14,54 @@ go_library( ], deps = [ "//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/tools/clientcmd:go_default_library", + "//staging/src/k8s.io/component-base/cli/flag: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/auth: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/debug: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/get: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/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", + "//staging/src/k8s.io/kubectl/pkg/util/term:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", + "//vendor/github.com/spf13/pflag:go_default_library", ], ) @@ -74,3 +121,14 @@ filegroup( tags = ["automanaged"], visibility = ["//visibility:public"], ) + +go_test( + name = "go_default_test", + srcs = ["cmd_test.go"], + data = ["//staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata"], + 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", + ], +) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD index 0ca4f4e62cc..0c8cdb68b2f 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/BUILD @@ -24,7 +24,10 @@ filegroup( filegroup( name = "all-srcs", - srcs = [":package-srcs"], + srcs = [ + ":package-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata:all-srcs", + ], tags = ["automanaged"], visibility = ["//visibility:public"], ) diff --git a/pkg/kubectl/cmd/plugin/testdata/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/BUILD similarity index 100% rename from pkg/kubectl/cmd/plugin/testdata/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/plugin/testdata/BUILD