From d6af3f2653a2eb3fa47eba67c0957df4cf77362c Mon Sep 17 00:00:00 2001 From: Sally O'Malley Date: Thu, 20 Jun 2019 21:22:04 -0400 Subject: [PATCH] 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