From 1b52c6180baa79e6fcbde911dce830c5266108dd Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 24 Jul 2019 20:02:05 -0700 Subject: [PATCH] Move pkg/kubectl/apps to staging --- pkg/kubectl/BUILD | 3 +- pkg/kubectl/history.go | 2 +- pkg/kubectl/rollback.go | 2 +- staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 2 + .../src/k8s.io/kubectl/pkg}/apps/BUILD | 39 +++++++++---------- .../kubectl/pkg}/apps/apps_suite_test.go | 0 .../k8s.io/kubectl/pkg}/apps/kind_visitor.go | 0 .../kubectl/pkg}/apps/kind_visitor_test.go | 2 +- vendor/modules.txt | 1 + 10 files changed, 26 insertions(+), 26 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apps/BUILD (76%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apps/apps_suite_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apps/kind_visitor.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/apps/kind_visitor_test.go (99%) diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 46c51c16fe5..5e0edbe5a36 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -58,7 +58,6 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubectl", deps = [ - "//pkg/kubectl/apps:go_default_library", "//pkg/kubectl/describe/versioned:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -83,6 +82,7 @@ go_library( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/apps:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", @@ -105,7 +105,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubectl/apply:all-srcs", - "//pkg/kubectl/apps:all-srcs", "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/describe:all-srcs", "//pkg/kubectl/drain:all-srcs", diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index b6c8e145576..60a14f8249b 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes" clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" + kapps "k8s.io/kubectl/pkg/apps" deploymentutil "k8s.io/kubectl/pkg/util/deployment" sliceutil "k8s.io/kubectl/pkg/util/slice" - kapps "k8s.io/kubernetes/pkg/kubectl/apps" describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned" ) diff --git a/pkg/kubectl/rollback.go b/pkg/kubectl/rollback.go index 22e7fca3a61..dc438f050cf 100644 --- a/pkg/kubectl/rollback.go +++ b/pkg/kubectl/rollback.go @@ -32,9 +32,9 @@ import ( "k8s.io/apimachinery/pkg/util/json" "k8s.io/apimachinery/pkg/util/strategicpatch" "k8s.io/client-go/kubernetes" + kapps "k8s.io/kubectl/pkg/apps" "k8s.io/kubectl/pkg/scheme" deploymentutil "k8s.io/kubectl/pkg/util/deployment" - kapps "k8s.io/kubernetes/pkg/kubectl/apps" ) const ( diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 671ee35d47e..d208f48ddd4 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/apps:all-srcs", "//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs", "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index fa7c44031da..c156465d7b0 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -11,6 +11,8 @@ require ( github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/mitchellh/go-wordwrap v1.0.0 + github.com/onsi/ginkgo v1.8.0 + github.com/onsi/gomega v1.5.0 github.com/russross/blackfriday v1.5.2 github.com/sirupsen/logrus v1.4.2 // indirect github.com/spf13/cobra v0.0.4 diff --git a/pkg/kubectl/apps/BUILD b/staging/src/k8s.io/kubectl/pkg/apps/BUILD similarity index 76% rename from pkg/kubectl/apps/BUILD rename to staging/src/k8s.io/kubectl/pkg/apps/BUILD index f505ddfc921..d59d553c41b 100644 --- a/pkg/kubectl/apps/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/apps/BUILD @@ -1,31 +1,14 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["kind_visitor.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/apps", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/apps", + importpath = "k8s.io/kubectl/pkg/apps", + visibility = ["//visibility:public"], deps = ["//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library"], ) -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) - go_test( name = "go_default_test", srcs = [ @@ -40,3 +23,17 @@ go_test( "//vendor/github.com/onsi/gomega: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/apps/apps_suite_test.go b/staging/src/k8s.io/kubectl/pkg/apps/apps_suite_test.go similarity index 100% rename from pkg/kubectl/apps/apps_suite_test.go rename to staging/src/k8s.io/kubectl/pkg/apps/apps_suite_test.go diff --git a/pkg/kubectl/apps/kind_visitor.go b/staging/src/k8s.io/kubectl/pkg/apps/kind_visitor.go similarity index 100% rename from pkg/kubectl/apps/kind_visitor.go rename to staging/src/k8s.io/kubectl/pkg/apps/kind_visitor.go diff --git a/pkg/kubectl/apps/kind_visitor_test.go b/staging/src/k8s.io/kubectl/pkg/apps/kind_visitor_test.go similarity index 99% rename from pkg/kubectl/apps/kind_visitor_test.go rename to staging/src/k8s.io/kubectl/pkg/apps/kind_visitor_test.go index 3d96920c6d9..9a1f69e45d3 100644 --- a/pkg/kubectl/apps/kind_visitor_test.go +++ b/staging/src/k8s.io/kubectl/pkg/apps/kind_visitor_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "k8s.io/kubernetes/pkg/kubectl/apps" + "k8s.io/kubectl/pkg/apps" ) var _ = Describe("When KindVisitor accepts a GroupKind", func() { diff --git a/vendor/modules.txt b/vendor/modules.txt index d75d1bf5a7e..fb77dd94c0c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1640,6 +1640,7 @@ k8s.io/kube-proxy/config/v1alpha1 # k8s.io/kube-scheduler v0.0.0 => ./staging/src/k8s.io/kube-scheduler k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl +k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util