From 4c58308b4e646be92f69dec772d70e81c1541148 Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Wed, 19 Jun 2019 22:53:12 -0400 Subject: [PATCH 1/4] Move pkg/kubectl/util/podutils to staging --- pkg/kubectl/polymorphichelpers/attachablepodforobject.go | 2 +- pkg/kubectl/polymorphichelpers/helpers_test.go | 2 +- pkg/kubectl/polymorphichelpers/logsforobject.go | 2 +- pkg/kubectl/rolling_updater.go | 2 +- .../src/k8s.io/kubectl/pkg}/util/podutils/podutils.go | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/podutils/podutils.go (100%) diff --git a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go index 52a4d053848..7b18111fd1f 100644 --- a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go +++ b/pkg/kubectl/polymorphichelpers/attachablepodforobject.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) // attachablePodForObject returns the pod to which to attach given an object. diff --git a/pkg/kubectl/polymorphichelpers/helpers_test.go b/pkg/kubectl/polymorphichelpers/helpers_test.go index 7afcd90c0fc..70afa2acac8 100644 --- a/pkg/kubectl/polymorphichelpers/helpers_test.go +++ b/pkg/kubectl/polymorphichelpers/helpers_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/watch" fakeexternal "k8s.io/client-go/kubernetes/fake" testcore "k8s.io/client-go/testing" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) func TestGetFirstPod(t *testing.T) { diff --git a/pkg/kubectl/polymorphichelpers/logsforobject.go b/pkg/kubectl/polymorphichelpers/logsforobject.go index cc7d23d01f8..68730191556 100644 --- a/pkg/kubectl/polymorphichelpers/logsforobject.go +++ b/pkg/kubectl/polymorphichelpers/logsforobject.go @@ -28,7 +28,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" + "k8s.io/kubectl/pkg/util/podutils" ) func logsForObject(restClientGetter genericclioptions.RESTClientGetter, object, options runtime.Object, timeout time.Duration, allContainers bool) ([]rest.ResponseWrapper, error) { diff --git a/pkg/kubectl/rolling_updater.go b/pkg/kubectl/rolling_updater.go index 54f94394db8..fbd423038e7 100644 --- a/pkg/kubectl/rolling_updater.go +++ b/pkg/kubectl/rolling_updater.go @@ -34,9 +34,9 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" scaleclient "k8s.io/client-go/scale" "k8s.io/client-go/util/retry" + "k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubernetes/pkg/kubectl/util" deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment" - "k8s.io/kubernetes/pkg/kubectl/util/podutils" "k8s.io/utils/integer" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/util/podutils/podutils.go b/staging/src/k8s.io/kubectl/pkg/util/podutils/podutils.go similarity index 100% rename from pkg/kubectl/util/podutils/podutils.go rename to staging/src/k8s.io/kubectl/pkg/util/podutils/podutils.go From a2691d8e93fb8b0156e5b558826bbe8c9271673b Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Wed, 19 Jun 2019 22:59:23 -0400 Subject: [PATCH 2/4] Removes unused BUILD file --- pkg/kubectl/util/podutils/BUILD | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 pkg/kubectl/util/podutils/BUILD diff --git a/pkg/kubectl/util/podutils/BUILD b/pkg/kubectl/util/podutils/BUILD deleted file mode 100644 index ec4c53d899d..00000000000 --- a/pkg/kubectl/util/podutils/BUILD +++ /dev/null @@ -1,27 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["podutils.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/podutils", - visibility = ["//visibility:public"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - "//vendor/k8s.io/utils/integer: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"], -) From d6af3f2653a2eb3fa47eba67c0957df4cf77362c Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Thu, 20 Jun 2019 21:22:04 -0400 Subject: [PATCH 3/4] Update go.mod, go.sum, and BUILD file dependencies --- pkg/kubectl/BUILD | 2 +- pkg/kubectl/polymorphichelpers/BUILD | 4 +-- pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 2 ++ .../k8s.io/kubectl/pkg/util/podutils/BUILD | 28 +++++++++++++++++++ vendor/modules.txt | 1 + 7 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/util/podutils/BUILD diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index b197d7cb589..357bd596816 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -63,7 +63,6 @@ go_library( "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/deployment:go_default_library", - "//pkg/kubectl/util/podutils:go_default_library", "//pkg/kubectl/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -88,6 +87,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/util/podutils:go_default_library", "//vendor/k8s.io/utils/integer:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], diff --git a/pkg/kubectl/polymorphichelpers/BUILD b/pkg/kubectl/polymorphichelpers/BUILD index 70ff133c0c9..a7d9ff35bc7 100644 --- a/pkg/kubectl/polymorphichelpers/BUILD +++ b/pkg/kubectl/polymorphichelpers/BUILD @@ -25,7 +25,6 @@ go_library( "//pkg/kubectl:go_default_library", "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/util/podutils:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", @@ -45,6 +44,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library", ], ) @@ -63,7 +63,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/util/podutils:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta2:go_default_library", @@ -81,6 +80,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library", ], ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 43eeea7e6b0..2eccecc86ef 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -73,7 +73,6 @@ filegroup( "//pkg/kubectl/util/hash:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", - "//pkg/kubectl/util/podutils:all-srcs", "//pkg/kubectl/util/qos:all-srcs", "//pkg/kubectl/util/rbac:all-srcs", "//pkg/kubectl/util/resource:all-srcs", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index e58e0c8d609..3d4df4bf4af 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -10,6 +10,7 @@ filegroup( srcs = [ ":package-srcs", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs", diff --git a/staging/src/k8s.io/kubectl/go.mod b/staging/src/k8s.io/kubectl/go.mod index 11b696a5ff2..8800fcbc3bb 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -17,8 +17,10 @@ require ( github.com/spf13/pflag v1.0.3 golang.org/x/sys v0.0.0-20190312061237-fead79001313 gotest.tools v2.2.0+incompatible // indirect + k8s.io/api v0.0.0 k8s.io/apimachinery v0.0.0 k8s.io/client-go v0.0.0 + k8s.io/utils v0.0.0-20190221042446-c2654d5206da ) replace ( diff --git a/staging/src/k8s.io/kubectl/pkg/util/podutils/BUILD b/staging/src/k8s.io/kubectl/pkg/util/podutils/BUILD new file mode 100644 index 00000000000..621109f2e05 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/podutils/BUILD @@ -0,0 +1,28 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["podutils.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/podutils", + importpath = "k8s.io/kubectl/pkg/util/podutils", + visibility = ["//visibility:public"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/utils/integer: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/vendor/modules.txt b/vendor/modules.txt index 5bf2f71935e..d9069351916 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1634,6 +1634,7 @@ k8s.io/kube-proxy/config/v1alpha1 k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl k8s.io/kubectl/pkg/util/interrupt +k8s.io/kubectl/pkg/util/podutils k8s.io/kubectl/pkg/util/printers k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term From fbc5c5df1c7a15df64fa2d8fa90879e28cbd8b8b Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Thu, 20 Jun 2019 21:24:27 -0400 Subject: [PATCH 4/4] Updated publishing dependencies rules, import-restrictions --- staging/publishing/import-restrictions.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/staging/publishing/import-restrictions.yaml b/staging/publishing/import-restrictions.yaml index 774765a8647..1e2be06b95e 100644 --- a/staging/publishing/import-restrictions.yaml +++ b/staging/publishing/import-restrictions.yaml @@ -125,9 +125,11 @@ - baseImportPath: "./vendor/k8s.io/kubectl/" allowedImports: + - k8s.io/api - k8s.io/apimachinery - k8s.io/client-go - k8s.io/kubectl + - k8s.io/utils - baseImportPath: "./vendor/k8s.io/sample-apiserver/" allowedImports: