From d730567a74e88f649f930efbf0a81767c4ba9b7d Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Sun, 28 Jul 2019 18:36:23 -0700 Subject: [PATCH] Move pkg/kubectl/apply and subdirectories to staging --- pkg/kubectl/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 1 + .../src/k8s.io/kubectl/pkg}/apply/BUILD | 7 ++++--- .../src/k8s.io/kubectl/pkg}/apply/doc.go | 0 .../src/k8s.io/kubectl/pkg}/apply/element.go | 0 .../kubectl/pkg}/apply/empty_element.go | 0 .../src/k8s.io/kubectl/pkg}/apply/error.go | 0 .../k8s.io/kubectl/pkg}/apply/list_element.go | 0 .../k8s.io/kubectl/pkg}/apply/map_element.go | 0 .../src/k8s.io/kubectl/pkg}/apply/parse/BUILD | 8 +++----- .../kubectl/pkg}/apply/parse/factory.go | 2 +- .../k8s.io/kubectl/pkg}/apply/parse/item.go | 2 +- .../kubectl/pkg}/apply/parse/list_element.go | 2 +- .../kubectl/pkg}/apply/parse/map_element.go | 2 +- .../kubectl/pkg}/apply/parse/openapi.go | 0 .../pkg}/apply/parse/primitive_element.go | 2 +- .../kubectl/pkg}/apply/parse/suite_test.go | 0 .../kubectl/pkg}/apply/parse/type_element.go | 2 +- .../k8s.io/kubectl/pkg}/apply/parse/util.go | 2 +- .../kubectl/pkg}/apply/parse/visitor.go | 2 +- .../kubectl/pkg}/apply/primitive_element.go | 0 .../k8s.io/kubectl/pkg}/apply/strategy/BUILD | 20 +++++++------------ .../k8s.io/kubectl/pkg}/apply/strategy/doc.go | 0 .../kubectl/pkg}/apply/strategy/merge.go | 2 +- .../apply/strategy/merge_conflict_test.go | 2 +- .../apply/strategy/merge_map_list_test.go | 2 +- .../pkg}/apply/strategy/merge_map_test.go | 2 +- .../strategy/merge_primitive_list_test.go | 2 +- .../apply/strategy/merge_primitive_test.go | 2 +- .../pkg}/apply/strategy/merge_visitor.go | 2 +- .../apply/strategy/replace_map_list_test.go | 2 +- .../pkg}/apply/strategy/replace_map_test.go | 2 +- .../strategy/replace_primitive_list_test.go | 2 +- .../pkg}/apply/strategy/replace_visitor.go | 2 +- .../pkg}/apply/strategy/retain_keys_test.go | 2 +- .../apply/strategy/retain_keys_visitor.go | 2 +- .../pkg}/apply/strategy/strategic_visitor.go | 2 +- .../kubectl/pkg}/apply/strategy/suite_test.go | 0 .../pkg}/apply/strategy/test_swagger.json | 0 .../kubectl/pkg}/apply/strategy/utils_test.go | 6 +++--- .../k8s.io/kubectl/pkg}/apply/type_element.go | 0 .../src/k8s.io/kubectl/pkg}/apply/visitor.go | 0 43 files changed, 41 insertions(+), 47 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/BUILD (73%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/doc.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/empty_element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/error.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/list_element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/map_element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/BUILD (87%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/factory.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/item.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/list_element.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/map_element.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/openapi.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/primitive_element.go (95%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/suite_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/type_element.go (97%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/util.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/parse/visitor.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/primitive_element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/BUILD (79%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/doc.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge.go (96%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_conflict_test.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_map_list_test.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_map_test.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_primitive_list_test.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_primitive_test.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/merge_visitor.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/replace_map_list_test.go (96%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/replace_map_test.go (97%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/replace_primitive_list_test.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/replace_visitor.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/retain_keys_test.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/retain_keys_visitor.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/strategic_visitor.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/suite_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/test_swagger.json (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/strategy/utils_test.go (95%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/type_element.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apply/visitor.go (100%) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 317d5b96b2e..9c5458e6a02 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -82,7 +82,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/apply:all-srcs", "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/explain:all-srcs", "//pkg/kubectl/generate:all-srcs", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 405afe863b1..df05d6fe69d 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -9,6 +9,7 @@ filegroup( name = "all-srcs", srcs = [ ":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/describe:all-srcs", "//staging/src/k8s.io/kubectl/pkg/drain:all-srcs", diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index ea1e3137df0..881ef215849 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -31,6 +31,7 @@ require ( k8s.io/klog v0.3.1 k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058 k8s.io/utils v0.0.0-20190607212802-c55fbcfc754a + sigs.k8s.io/yaml v1.1.0 ) replace ( diff --git a/pkg/kubectl/apply/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/BUILD similarity index 73% rename from pkg/kubectl/apply/BUILD rename to staging/src/k8s.io/kubectl/pkg/apply/BUILD index 419388c1d4a..e132856afc4 100644 --- a/pkg/kubectl/apply/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apply/BUILD @@ -13,7 +13,8 @@ go_library( "type_element.go", "visitor.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/apply", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply", + importpath = "k8s.io/kubectl/pkg/apply", visibility = ["//visibility:public"], ) @@ -28,8 +29,8 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/apply/parse:all-srcs", - "//pkg/kubectl/apply/strategy:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/apply/parse:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/apply/strategy:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/kubectl/apply/doc.go b/staging/src/k8s.io/kubectl/pkg/apply/doc.go similarity index 100% rename from pkg/kubectl/apply/doc.go rename to staging/src/k8s.io/kubectl/pkg/apply/doc.go diff --git a/pkg/kubectl/apply/element.go b/staging/src/k8s.io/kubectl/pkg/apply/element.go similarity index 100% rename from pkg/kubectl/apply/element.go rename to staging/src/k8s.io/kubectl/pkg/apply/element.go diff --git a/pkg/kubectl/apply/empty_element.go b/staging/src/k8s.io/kubectl/pkg/apply/empty_element.go similarity index 100% rename from pkg/kubectl/apply/empty_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/empty_element.go diff --git a/pkg/kubectl/apply/error.go b/staging/src/k8s.io/kubectl/pkg/apply/error.go similarity index 100% rename from pkg/kubectl/apply/error.go rename to staging/src/k8s.io/kubectl/pkg/apply/error.go diff --git a/pkg/kubectl/apply/list_element.go b/staging/src/k8s.io/kubectl/pkg/apply/list_element.go similarity index 100% rename from pkg/kubectl/apply/list_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/list_element.go diff --git a/pkg/kubectl/apply/map_element.go b/staging/src/k8s.io/kubectl/pkg/apply/map_element.go similarity index 100% rename from pkg/kubectl/apply/map_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/map_element.go diff --git a/pkg/kubectl/apply/parse/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/parse/BUILD similarity index 87% rename from pkg/kubectl/apply/parse/BUILD rename to staging/src/k8s.io/kubectl/pkg/apply/parse/BUILD index 643ecc98a1a..dbe69118d8f 100644 --- a/pkg/kubectl/apply/parse/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/BUILD @@ -13,11 +13,12 @@ go_library( "util.go", "visitor.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/apply/parse", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply/parse", + importpath = "k8s.io/kubectl/pkg/apply/parse", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/apply:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/apply:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library", ], @@ -26,9 +27,6 @@ go_library( go_test( name = "go_default_test", srcs = ["suite_test.go"], - data = [ - "//api/openapi-spec", - ], embed = [":go_default_library"], deps = [ "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/pkg/kubectl/apply/parse/factory.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/factory.go similarity index 98% rename from pkg/kubectl/apply/parse/factory.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/factory.go index f8748a904cb..2c36c178191 100644 --- a/pkg/kubectl/apply/parse/factory.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/factory.go @@ -21,8 +21,8 @@ import ( "reflect" "k8s.io/kube-openapi/pkg/util/proto" + "k8s.io/kubectl/pkg/apply" "k8s.io/kubectl/pkg/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/apply" ) // Factory creates an Element by combining object values from recorded, local and remote sources with diff --git a/pkg/kubectl/apply/parse/item.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/item.go similarity index 98% rename from pkg/kubectl/apply/parse/item.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/item.go index 15eae075f7d..d036afa9fe7 100644 --- a/pkg/kubectl/apply/parse/item.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/item.go @@ -18,7 +18,7 @@ package parse import ( "k8s.io/kube-openapi/pkg/util/proto" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // Item wraps values from 3 sources (recorded, local, remote). diff --git a/pkg/kubectl/apply/parse/list_element.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/list_element.go similarity index 99% rename from pkg/kubectl/apply/parse/list_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/list_element.go index 487a5f19ff5..30063d921d0 100644 --- a/pkg/kubectl/apply/parse/list_element.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/list_element.go @@ -20,7 +20,7 @@ import ( "fmt" "k8s.io/kube-openapi/pkg/util/proto" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // Contains the heavy lifting for finding tuples of matching elements in lists based on the merge key diff --git a/pkg/kubectl/apply/parse/map_element.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/map_element.go similarity index 98% rename from pkg/kubectl/apply/parse/map_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/map_element.go index 0580ab1ba11..dde1bc80083 100644 --- a/pkg/kubectl/apply/parse/map_element.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/map_element.go @@ -18,7 +18,7 @@ package parse import ( "k8s.io/kube-openapi/pkg/util/proto" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // mapElement builds a new mapElement from a mapItem diff --git a/pkg/kubectl/apply/parse/openapi.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/openapi.go similarity index 100% rename from pkg/kubectl/apply/parse/openapi.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/openapi.go diff --git a/pkg/kubectl/apply/parse/primitive_element.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/primitive_element.go similarity index 95% rename from pkg/kubectl/apply/parse/primitive_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/primitive_element.go index de393e86a50..b6a82757201 100644 --- a/pkg/kubectl/apply/parse/primitive_element.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/primitive_element.go @@ -16,7 +16,7 @@ limitations under the License. package parse -import "k8s.io/kubernetes/pkg/kubectl/apply" +import "k8s.io/kubectl/pkg/apply" // primitiveElement builds a new primitiveElement from a PrimitiveItem func (v ElementBuildingVisitor) primitiveElement(item *primitiveItem) (*apply.PrimitiveElement, error) { diff --git a/pkg/kubectl/apply/parse/suite_test.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/suite_test.go similarity index 100% rename from pkg/kubectl/apply/parse/suite_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/suite_test.go diff --git a/pkg/kubectl/apply/parse/type_element.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/type_element.go similarity index 97% rename from pkg/kubectl/apply/parse/type_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/type_element.go index e2fa1d8b682..6da95956c1c 100644 --- a/pkg/kubectl/apply/parse/type_element.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/type_element.go @@ -18,7 +18,7 @@ package parse import ( "k8s.io/kube-openapi/pkg/util/proto" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // typeElement builds a new mapElement from a typeItem diff --git a/pkg/kubectl/apply/parse/util.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/util.go similarity index 99% rename from pkg/kubectl/apply/parse/util.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/util.go index 676ab7d3d0f..58300c9e80d 100644 --- a/pkg/kubectl/apply/parse/util.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/util.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/kube-openapi/pkg/util/proto" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // nilSafeLookup returns the value from the map if the map is non-nil diff --git a/pkg/kubectl/apply/parse/visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/visitor.go similarity index 98% rename from pkg/kubectl/apply/parse/visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/parse/visitor.go index 385ec6fb4b1..06ce2457ad9 100644 --- a/pkg/kubectl/apply/parse/visitor.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/parse/visitor.go @@ -17,8 +17,8 @@ limitations under the License. package parse import ( + "k8s.io/kubectl/pkg/apply" "k8s.io/kubectl/pkg/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/apply" ) // ItemVisitor provides an interface for Items to Accept and call diff --git a/pkg/kubectl/apply/primitive_element.go b/staging/src/k8s.io/kubectl/pkg/apply/primitive_element.go similarity index 100% rename from pkg/kubectl/apply/primitive_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/primitive_element.go diff --git a/pkg/kubectl/apply/strategy/BUILD b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD similarity index 79% rename from pkg/kubectl/apply/strategy/BUILD rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD index 4595ea9fa6b..d9353918071 100644 --- a/pkg/kubectl/apply/strategy/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/BUILD @@ -10,9 +10,10 @@ go_library( "retain_keys_visitor.go", "strategic_visitor.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/apply/strategy", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apply/strategy", + importpath = "k8s.io/kubectl/pkg/apply/strategy", visibility = ["//visibility:public"], - deps = ["//pkg/kubectl/apply:go_default_library"], + deps = ["//staging/src/k8s.io/kubectl/pkg/apply:go_default_library"], ) go_test( @@ -31,14 +32,14 @@ go_test( "utils_test.go", ], data = [ - ":openapi-spec", - "//api/openapi-spec", + "test_swagger.json", + "//staging/src/k8s.io/kubectl/test/data/openapi", ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/apply:go_default_library", - "//pkg/kubectl/apply/parse:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/apply:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/apply/parse: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", "//vendor/github.com/onsi/ginkgo:go_default_library", @@ -62,10 +63,3 @@ filegroup( tags = ["automanaged"], visibility = ["//visibility:public"], ) - -filegroup( - name = "openapi-spec", - srcs = glob([ - "**/*.json", - ]), -) diff --git a/pkg/kubectl/apply/strategy/doc.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/doc.go similarity index 100% rename from pkg/kubectl/apply/strategy/doc.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/doc.go diff --git a/pkg/kubectl/apply/strategy/merge.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge.go similarity index 96% rename from pkg/kubectl/apply/strategy/merge.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge.go index 393ffc0a250..100fb3e4108 100644 --- a/pkg/kubectl/apply/strategy/merge.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge.go @@ -16,7 +16,7 @@ limitations under the License. package strategy -import "k8s.io/kubernetes/pkg/kubectl/apply" +import "k8s.io/kubectl/pkg/apply" // Options controls how a merge will be executed type Options struct { diff --git a/pkg/kubectl/apply/strategy/merge_conflict_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_conflict_test.go similarity index 98% rename from pkg/kubectl/apply/strategy/merge_conflict_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_conflict_test.go index 395f4303038..dd4a6a5fe5a 100644 --- a/pkg/kubectl/apply/strategy/merge_conflict_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_conflict_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Comparing fields of remote and recorded ", func() { diff --git a/pkg/kubectl/apply/strategy/merge_map_list_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_list_test.go similarity index 99% rename from pkg/kubectl/apply/strategy/merge_map_list_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_list_test.go index 3f8209e2126..3eca303305b 100644 --- a/pkg/kubectl/apply/strategy/merge_map_list_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_list_test.go @@ -19,9 +19,9 @@ package strategy_test import ( . "github.com/onsi/ginkgo" + "k8s.io/kubectl/pkg/apply/strategy" "k8s.io/kubectl/pkg/util/openapi" tst "k8s.io/kubectl/pkg/util/openapi/testing" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" ) var _ = Describe("Merging fields of type list-of-map with openapi", func() { diff --git a/pkg/kubectl/apply/strategy/merge_map_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_test.go similarity index 98% rename from pkg/kubectl/apply/strategy/merge_map_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_test.go index 95f37e6294b..3496fa14466 100644 --- a/pkg/kubectl/apply/strategy/merge_map_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_map_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Merging fields of type map with openapi for some fields", func() { diff --git a/pkg/kubectl/apply/strategy/merge_primitive_list_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_list_test.go similarity index 98% rename from pkg/kubectl/apply/strategy/merge_primitive_list_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_list_test.go index 11c643efeaf..f2ffdf40479 100644 --- a/pkg/kubectl/apply/strategy/merge_primitive_list_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_list_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Merging fields of type list-of-primitive with openapi", func() { diff --git a/pkg/kubectl/apply/strategy/merge_primitive_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_test.go similarity index 99% rename from pkg/kubectl/apply/strategy/merge_primitive_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_test.go index fc245c0d6fe..cc7d13dba3d 100644 --- a/pkg/kubectl/apply/strategy/merge_primitive_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_primitive_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Merging fields of type map with openapi", func() { diff --git a/pkg/kubectl/apply/strategy/merge_visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_visitor.go similarity index 99% rename from pkg/kubectl/apply/strategy/merge_visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_visitor.go index 5a1b1a003ca..ac65d954043 100644 --- a/pkg/kubectl/apply/strategy/merge_visitor.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/merge_visitor.go @@ -19,7 +19,7 @@ package strategy import ( "fmt" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) func createMergeStrategy(options Options, strategic *delegatingStrategy) mergeStrategy { diff --git a/pkg/kubectl/apply/strategy/replace_map_list_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_list_test.go similarity index 96% rename from pkg/kubectl/apply/strategy/replace_map_list_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_list_test.go index 025f0ca810c..70f9f1e66df 100644 --- a/pkg/kubectl/apply/strategy/replace_map_list_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_list_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Replacing fields of type list without openapi", func() { diff --git a/pkg/kubectl/apply/strategy/replace_map_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_test.go similarity index 97% rename from pkg/kubectl/apply/strategy/replace_map_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_test.go index 8eb37a41e91..8b5d5604ddb 100644 --- a/pkg/kubectl/apply/strategy/replace_map_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_map_test.go @@ -19,9 +19,9 @@ package strategy_test import ( . "github.com/onsi/ginkgo" + "k8s.io/kubectl/pkg/apply/strategy" "k8s.io/kubectl/pkg/util/openapi" tst "k8s.io/kubectl/pkg/util/openapi/testing" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" ) var _ = Describe("Replacing fields of type map with openapi for some fields", func() { diff --git a/pkg/kubectl/apply/strategy/replace_primitive_list_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_primitive_list_test.go similarity index 99% rename from pkg/kubectl/apply/strategy/replace_primitive_list_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_primitive_list_test.go index 0bc95b5a2dc..b10a2b5e166 100644 --- a/pkg/kubectl/apply/strategy/replace_primitive_list_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_primitive_list_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Replacing fields of type list with openapi", func() { diff --git a/pkg/kubectl/apply/strategy/replace_visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_visitor.go similarity index 98% rename from pkg/kubectl/apply/strategy/replace_visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_visitor.go index 047d53ff1bb..345ef226903 100644 --- a/pkg/kubectl/apply/strategy/replace_visitor.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/replace_visitor.go @@ -17,7 +17,7 @@ limitations under the License. package strategy import ( - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // replaceVisitor creates a patch to replace a remote field value with a local field value diff --git a/pkg/kubectl/apply/strategy/retain_keys_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_test.go similarity index 98% rename from pkg/kubectl/apply/strategy/retain_keys_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_test.go index edc6a4a78d7..a2426ad67c2 100644 --- a/pkg/kubectl/apply/strategy/retain_keys_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_test.go @@ -19,7 +19,7 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - "k8s.io/kubernetes/pkg/kubectl/apply/strategy" + "k8s.io/kubectl/pkg/apply/strategy" ) var _ = Describe("Merging fields with the retainkeys strategy", func() { diff --git a/pkg/kubectl/apply/strategy/retain_keys_visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_visitor.go similarity index 98% rename from pkg/kubectl/apply/strategy/retain_keys_visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_visitor.go index b901285be1e..169b2ec7525 100644 --- a/pkg/kubectl/apply/strategy/retain_keys_visitor.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/retain_keys_visitor.go @@ -18,7 +18,7 @@ package strategy import ( "fmt" - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) func createRetainKeysStrategy(options Options, strategic *delegatingStrategy) retainKeysStrategy { diff --git a/pkg/kubectl/apply/strategy/strategic_visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/strategic_visitor.go similarity index 98% rename from pkg/kubectl/apply/strategy/strategic_visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/strategic_visitor.go index 8c2d592b05b..7278cc93ac4 100644 --- a/pkg/kubectl/apply/strategy/strategic_visitor.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/strategic_visitor.go @@ -17,7 +17,7 @@ limitations under the License. package strategy import ( - "k8s.io/kubernetes/pkg/kubectl/apply" + "k8s.io/kubectl/pkg/apply" ) // delegatingStrategy delegates merging fields to other visitor implementations diff --git a/pkg/kubectl/apply/strategy/suite_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/suite_test.go similarity index 100% rename from pkg/kubectl/apply/strategy/suite_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/suite_test.go diff --git a/pkg/kubectl/apply/strategy/test_swagger.json b/staging/src/k8s.io/kubectl/pkg/apply/strategy/test_swagger.json similarity index 100% rename from pkg/kubectl/apply/strategy/test_swagger.json rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/test_swagger.json diff --git a/pkg/kubectl/apply/strategy/utils_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go similarity index 95% rename from pkg/kubectl/apply/strategy/utils_test.go rename to staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go index 47f3613de49..c06a34397d5 100644 --- a/pkg/kubectl/apply/strategy/utils_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apply/strategy/utils_test.go @@ -26,10 +26,10 @@ import ( "sigs.k8s.io/yaml" "k8s.io/apimachinery/pkg/util/diff" + "k8s.io/kubectl/pkg/apply" + "k8s.io/kubectl/pkg/apply/parse" "k8s.io/kubectl/pkg/util/openapi" tst "k8s.io/kubectl/pkg/util/openapi/testing" - "k8s.io/kubernetes/pkg/kubectl/apply" - "k8s.io/kubernetes/pkg/kubectl/apply/parse" ) const ( @@ -37,7 +37,7 @@ const ( noConflict = false ) -var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json")) +var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "test", "data", "openapi", "swagger.json")) // run parses the openapi and runs the tests func run(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}) { diff --git a/pkg/kubectl/apply/type_element.go b/staging/src/k8s.io/kubectl/pkg/apply/type_element.go similarity index 100% rename from pkg/kubectl/apply/type_element.go rename to staging/src/k8s.io/kubectl/pkg/apply/type_element.go diff --git a/pkg/kubectl/apply/visitor.go b/staging/src/k8s.io/kubectl/pkg/apply/visitor.go similarity index 100% rename from pkg/kubectl/apply/visitor.go rename to staging/src/k8s.io/kubectl/pkg/apply/visitor.go