From 1252ab3c983d8e4f1de18ffbf57b799e5882a8d1 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Mon, 29 Jul 2019 14:57:41 -0700 Subject: [PATCH] Move pkg/kubect/explain to staging --- pkg/kubectl/BUILD | 1 - pkg/kubectl/cmd/explain/BUILD | 2 +- pkg/kubectl/cmd/explain/explain.go | 2 +- staging/src/k8s.io/kubectl/BUILD | 1 + .../src/k8s.io/kubectl/pkg}/explain/BUILD | 31 ++++++++++--------- .../src/k8s.io/kubectl/pkg}/explain/OWNERS | 0 .../k8s.io/kubectl/pkg}/explain/explain.go | 0 .../kubectl/pkg}/explain/explain_test.go | 0 .../kubectl/pkg}/explain/field_lookup.go | 0 .../kubectl/pkg}/explain/field_lookup_test.go | 0 .../kubectl/pkg}/explain/fields_printer.go | 0 .../pkg}/explain/fields_printer_builder.go | 0 .../pkg}/explain/fields_printer_test.go | 0 .../k8s.io/kubectl/pkg}/explain/formatter.go | 0 .../kubectl/pkg}/explain/formatter_test.go | 0 .../kubectl/pkg}/explain/model_printer.go | 0 .../pkg}/explain/model_printer_test.go | 0 .../pkg}/explain/recursive_fields_printer.go | 0 .../explain/recursive_fields_printer_test.go | 0 .../pkg}/explain/test-recursive-swagger.json | 0 .../kubectl/pkg}/explain/test-swagger.json | 0 .../k8s.io/kubectl/pkg}/explain/typename.go | 0 .../kubectl/pkg}/explain/typename_test.go | 0 vendor/modules.txt | 1 + 24 files changed, 20 insertions(+), 18 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/BUILD (93%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/OWNERS (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/explain.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/explain_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/field_lookup.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/field_lookup_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/fields_printer.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/fields_printer_builder.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/fields_printer_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/formatter.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/formatter_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/model_printer.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/model_printer_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/recursive_fields_printer.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/recursive_fields_printer_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/test-recursive-swagger.json (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/test-swagger.json (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/typename.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/explain/typename_test.go (100%) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 8161f8bd96d..f55ef3b8688 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -80,7 +80,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubectl/cmd:all-srcs", - "//pkg/kubectl/explain:all-srcs", ], tags = ["automanaged"], ) diff --git a/pkg/kubectl/cmd/explain/BUILD b/pkg/kubectl/cmd/explain/BUILD index d48fb017f34..78f2ce4c00f 100644 --- a/pkg/kubectl/cmd/explain/BUILD +++ b/pkg/kubectl/cmd/explain/BUILD @@ -6,11 +6,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/explain", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/explain:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta: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/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/explain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/explain/explain.go b/pkg/kubectl/cmd/explain/explain.go index 70421bc694c..97817fcd5f7 100644 --- a/pkg/kubectl/cmd/explain/explain.go +++ b/pkg/kubectl/cmd/explain/explain.go @@ -25,10 +25,10 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/explain" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/explain" ) var ( diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 5cdf8140585..4e535e6c903 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -14,6 +14,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/cmd/util: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", "//staging/src/k8s.io/kubectl/pkg/generate:all-srcs", "//staging/src/k8s.io/kubectl/pkg/generated:all-srcs", "//staging/src/k8s.io/kubectl/pkg/metricsutil:all-srcs", diff --git a/pkg/kubectl/explain/BUILD b/staging/src/k8s.io/kubectl/pkg/explain/BUILD similarity index 93% rename from pkg/kubectl/explain/BUILD rename to staging/src/k8s.io/kubectl/pkg/explain/BUILD index 17e983061dd..91bd8c8b6e9 100644 --- a/pkg/kubectl/explain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/explain/BUILD @@ -12,7 +12,8 @@ go_library( "recursive_fields_printer.go", "typename.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/explain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/explain", + importpath = "k8s.io/kubectl/pkg/explain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -21,20 +22,6 @@ go_library( ], ) -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) - go_test( name = "go_default_test", srcs = [ @@ -58,3 +45,17 @@ go_test( "//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library", ], ) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/kubectl/explain/OWNERS b/staging/src/k8s.io/kubectl/pkg/explain/OWNERS similarity index 100% rename from pkg/kubectl/explain/OWNERS rename to staging/src/k8s.io/kubectl/pkg/explain/OWNERS diff --git a/pkg/kubectl/explain/explain.go b/staging/src/k8s.io/kubectl/pkg/explain/explain.go similarity index 100% rename from pkg/kubectl/explain/explain.go rename to staging/src/k8s.io/kubectl/pkg/explain/explain.go diff --git a/pkg/kubectl/explain/explain_test.go b/staging/src/k8s.io/kubectl/pkg/explain/explain_test.go similarity index 100% rename from pkg/kubectl/explain/explain_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/explain_test.go diff --git a/pkg/kubectl/explain/field_lookup.go b/staging/src/k8s.io/kubectl/pkg/explain/field_lookup.go similarity index 100% rename from pkg/kubectl/explain/field_lookup.go rename to staging/src/k8s.io/kubectl/pkg/explain/field_lookup.go diff --git a/pkg/kubectl/explain/field_lookup_test.go b/staging/src/k8s.io/kubectl/pkg/explain/field_lookup_test.go similarity index 100% rename from pkg/kubectl/explain/field_lookup_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/field_lookup_test.go diff --git a/pkg/kubectl/explain/fields_printer.go b/staging/src/k8s.io/kubectl/pkg/explain/fields_printer.go similarity index 100% rename from pkg/kubectl/explain/fields_printer.go rename to staging/src/k8s.io/kubectl/pkg/explain/fields_printer.go diff --git a/pkg/kubectl/explain/fields_printer_builder.go b/staging/src/k8s.io/kubectl/pkg/explain/fields_printer_builder.go similarity index 100% rename from pkg/kubectl/explain/fields_printer_builder.go rename to staging/src/k8s.io/kubectl/pkg/explain/fields_printer_builder.go diff --git a/pkg/kubectl/explain/fields_printer_test.go b/staging/src/k8s.io/kubectl/pkg/explain/fields_printer_test.go similarity index 100% rename from pkg/kubectl/explain/fields_printer_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/fields_printer_test.go diff --git a/pkg/kubectl/explain/formatter.go b/staging/src/k8s.io/kubectl/pkg/explain/formatter.go similarity index 100% rename from pkg/kubectl/explain/formatter.go rename to staging/src/k8s.io/kubectl/pkg/explain/formatter.go diff --git a/pkg/kubectl/explain/formatter_test.go b/staging/src/k8s.io/kubectl/pkg/explain/formatter_test.go similarity index 100% rename from pkg/kubectl/explain/formatter_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/formatter_test.go diff --git a/pkg/kubectl/explain/model_printer.go b/staging/src/k8s.io/kubectl/pkg/explain/model_printer.go similarity index 100% rename from pkg/kubectl/explain/model_printer.go rename to staging/src/k8s.io/kubectl/pkg/explain/model_printer.go diff --git a/pkg/kubectl/explain/model_printer_test.go b/staging/src/k8s.io/kubectl/pkg/explain/model_printer_test.go similarity index 100% rename from pkg/kubectl/explain/model_printer_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/model_printer_test.go diff --git a/pkg/kubectl/explain/recursive_fields_printer.go b/staging/src/k8s.io/kubectl/pkg/explain/recursive_fields_printer.go similarity index 100% rename from pkg/kubectl/explain/recursive_fields_printer.go rename to staging/src/k8s.io/kubectl/pkg/explain/recursive_fields_printer.go diff --git a/pkg/kubectl/explain/recursive_fields_printer_test.go b/staging/src/k8s.io/kubectl/pkg/explain/recursive_fields_printer_test.go similarity index 100% rename from pkg/kubectl/explain/recursive_fields_printer_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/recursive_fields_printer_test.go diff --git a/pkg/kubectl/explain/test-recursive-swagger.json b/staging/src/k8s.io/kubectl/pkg/explain/test-recursive-swagger.json similarity index 100% rename from pkg/kubectl/explain/test-recursive-swagger.json rename to staging/src/k8s.io/kubectl/pkg/explain/test-recursive-swagger.json diff --git a/pkg/kubectl/explain/test-swagger.json b/staging/src/k8s.io/kubectl/pkg/explain/test-swagger.json similarity index 100% rename from pkg/kubectl/explain/test-swagger.json rename to staging/src/k8s.io/kubectl/pkg/explain/test-swagger.json diff --git a/pkg/kubectl/explain/typename.go b/staging/src/k8s.io/kubectl/pkg/explain/typename.go similarity index 100% rename from pkg/kubectl/explain/typename.go rename to staging/src/k8s.io/kubectl/pkg/explain/typename.go diff --git a/pkg/kubectl/explain/typename_test.go b/staging/src/k8s.io/kubectl/pkg/explain/typename_test.go similarity index 100% rename from pkg/kubectl/explain/typename_test.go rename to staging/src/k8s.io/kubectl/pkg/explain/typename_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 05d71a9b1ee..ab73d2b1ecf 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1649,6 +1649,7 @@ k8s.io/kubectl/pkg/cmd/util/sanity k8s.io/kubectl/pkg/describe k8s.io/kubectl/pkg/describe/versioned k8s.io/kubectl/pkg/drain +k8s.io/kubectl/pkg/explain k8s.io/kubectl/pkg/generate k8s.io/kubectl/pkg/generate/versioned k8s.io/kubectl/pkg/generated