diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index c43789a3930..39784824551 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -240,7 +240,6 @@ package_group( "//pkg/kubectl/cmd/auth", "//pkg/kubectl/cmd/convert", "//pkg/kubectl/cmd/cp", - "//pkg/kubectl/cmd/get", "//pkg/kubectl/explain", "//staging/src/k8s.io/kubectl/pkg/cmd", "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", @@ -255,6 +254,7 @@ package_group( "//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/get", "//staging/src/k8s.io/kubectl/pkg/cmd/label", "//staging/src/k8s.io/kubectl/pkg/cmd/logs", "//staging/src/k8s.io/kubectl/pkg/cmd/patch", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 9aa20b6298d..74bd6c16c5e 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -12,7 +12,6 @@ go_library( "//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library", "//pkg/kubectl/cmd/cp: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", @@ -35,6 +34,7 @@ go_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", @@ -86,7 +86,6 @@ filegroup( "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", "//pkg/kubectl/cmd/cp:all-srcs", - "//pkg/kubectl/cmd/get:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index a19fe0be5f6..76c5a8f8f4f 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -49,6 +49,7 @@ import ( cmdexec "k8s.io/kubectl/pkg/cmd/exec" "k8s.io/kubectl/pkg/cmd/explain" "k8s.io/kubectl/pkg/cmd/expose" + "k8s.io/kubectl/pkg/cmd/get" "k8s.io/kubectl/pkg/cmd/label" "k8s.io/kubectl/pkg/cmd/logs" "k8s.io/kubectl/pkg/cmd/options" @@ -72,7 +73,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" "k8s.io/kubernetes/pkg/kubectl/cmd/cp" - "k8s.io/kubernetes/pkg/kubectl/cmd/get" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/cmd/kustomize" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index ff8112d60c7..1bd588cb8fa 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -45,6 +45,7 @@ filegroup( "//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/get: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", diff --git a/pkg/kubectl/cmd/get/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD similarity index 96% rename from pkg/kubectl/cmd/get/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD index af2e32ee1a8..a919dd09779 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/BUILD @@ -26,7 +26,8 @@ go_library( "sorter.go", "table_printer.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/get", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/get", + importpath = "k8s.io/kubectl/pkg/cmd/get", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -72,11 +73,7 @@ go_test( "humanreadable_flags_test.go", "sorter_test.go", ], - data = [ - "//api/openapi-spec", - "//test/e2e/testing-manifests:all-srcs", - "//test/fixtures", - ], + data = ["//staging/src/k8s.io/kubectl/test/data"], embed = [":go_default_library"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/pkg/kubectl/cmd/get/customcolumn.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn.go diff --git a/pkg/kubectl/cmd/get/customcolumn_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags.go diff --git a/pkg/kubectl/cmd/get/customcolumn_flags_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags_test.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_flags_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_flags_test.go diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_test.go similarity index 100% rename from pkg/kubectl/cmd/get/customcolumn_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/customcolumn_test.go diff --git a/pkg/kubectl/cmd/get/get.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get.go similarity index 100% rename from pkg/kubectl/cmd/get/get.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get.go diff --git a/pkg/kubectl/cmd/get/get_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/get_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get_flags.go diff --git a/pkg/kubectl/cmd/get/get_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go similarity index 99% rename from pkg/kubectl/cmd/get/get_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go index d3a9b9a2ab6..425220adb8d 100644 --- a/pkg/kubectl/cmd/get/get_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/get/get_test.go @@ -1079,7 +1079,7 @@ func TestGetObjectsIdentifiedByFile(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdGet("kubectl", tf, streams) cmd.SetOutput(buf) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME AGE @@ -1105,7 +1105,7 @@ func TestGetTableObjectsIdentifiedByFile(t *testing.T) { streams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdGet("kubectl", tf, streams) cmd.SetOutput(buf) - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME READY STATUS RESTARTS AGE @@ -2495,7 +2495,7 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) { cmd.SetOutput(buf) cmd.Flags().Set("watch", "true") - cmd.Flags().Set("filename", "../../../../test/e2e/testing-manifests/statefulset/cassandra/controller.yaml") + cmd.Flags().Set("filename", "../../../test/data/controller.yaml") cmd.Run(cmd, []string{}) expected := `NAME AGE diff --git a/pkg/kubectl/cmd/get/humanreadable_flags.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags.go similarity index 100% rename from pkg/kubectl/cmd/get/humanreadable_flags.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags.go diff --git a/pkg/kubectl/cmd/get/humanreadable_flags_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags_test.go similarity index 100% rename from pkg/kubectl/cmd/get/humanreadable_flags_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/humanreadable_flags_test.go diff --git a/pkg/kubectl/cmd/get/skip_printer.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/skip_printer.go similarity index 100% rename from pkg/kubectl/cmd/get/skip_printer.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/skip_printer.go diff --git a/pkg/kubectl/cmd/get/sorter.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go similarity index 100% rename from pkg/kubectl/cmd/get/sorter.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/sorter.go diff --git a/pkg/kubectl/cmd/get/sorter_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/sorter_test.go similarity index 100% rename from pkg/kubectl/cmd/get/sorter_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/sorter_test.go diff --git a/pkg/kubectl/cmd/get/table_printer.go b/staging/src/k8s.io/kubectl/pkg/cmd/get/table_printer.go similarity index 100% rename from pkg/kubectl/cmd/get/table_printer.go rename to staging/src/k8s.io/kubectl/pkg/cmd/get/table_printer.go