From 541cb300c74c6d9b4d02fa3199f5a100c3108860 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 13:04:40 -0700 Subject: [PATCH 1/3] Move pkg/kubectl/util/certificate to staging --- build/root/BUILD.root | 6 +++++ pkg/kubectl/util/certificate/BUILD | 10 -------- staging/src/k8s.io/kubectl/BUILD | 1 + .../k8s.io/kubectl/pkg/util/certificate/BUILD | 24 +++++++++++++++++++ .../pkg}/util/certificate/certificate.go | 0 5 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/util/certificate/BUILD rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/certificate/certificate.go (100%) diff --git a/build/root/BUILD.root b/build/root/BUILD.root index 41b76e68ba5..4ab7f316be6 100644 --- a/build/root/BUILD.root +++ b/build/root/BUILD.root @@ -89,6 +89,12 @@ filegroup( "//cmd:all-srcs", "//docs:all-srcs", "//hack:all-srcs", + "//kubernetes/cluster:all-srcs", + "//kubernetes/docs:all-srcs", + "//kubernetes/hack:all-srcs", + "//kubernetes/test/e2e/testing-manifests:all-srcs", + "//kubernetes/test/images:all-srcs", + "//kubernetes/test/kubemark:all-srcs", "//pkg:all-srcs", "//plugin:all-srcs", "//staging:all-srcs", diff --git a/pkg/kubectl/util/certificate/BUILD b/pkg/kubectl/util/certificate/BUILD index cac97d41705..6df04e38cd7 100644 --- a/pkg/kubectl/util/certificate/BUILD +++ b/pkg/kubectl/util/certificate/BUILD @@ -1,13 +1,3 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["certificate.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/certificate", - visibility = ["//visibility:public"], - deps = ["//staging/src/k8s.io/api/certificates/v1beta1:go_default_library"], -) - filegroup( name = "package-srcs", srcs = glob(["**"]), diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 0d865cbcc39..7a2d2e34cf3 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/util/certificate:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs", diff --git a/staging/src/k8s.io/kubectl/pkg/util/certificate/BUILD b/staging/src/k8s.io/kubectl/pkg/util/certificate/BUILD new file mode 100644 index 00000000000..49bda5e7cdd --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/certificate/BUILD @@ -0,0 +1,24 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["certificate.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/certificate", + importpath = "k8s.io/kubectl/pkg/util/certificate", + visibility = ["//visibility:public"], + deps = ["//staging/src/k8s.io/api/certificates/v1beta1: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/util/certificate/certificate.go b/staging/src/k8s.io/kubectl/pkg/util/certificate/certificate.go similarity index 100% rename from pkg/kubectl/util/certificate/certificate.go rename to staging/src/k8s.io/kubectl/pkg/util/certificate/certificate.go From d31972a0e547fccd8c403ff195dcd7e22e315e16 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 13:08:29 -0700 Subject: [PATCH 2/3] Removes unused BUILD file --- pkg/kubectl/util/certificate/BUILD | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pkg/kubectl/util/certificate/BUILD diff --git a/pkg/kubectl/util/certificate/BUILD b/pkg/kubectl/util/certificate/BUILD deleted file mode 100644 index 6df04e38cd7..00000000000 --- a/pkg/kubectl/util/certificate/BUILD +++ /dev/null @@ -1,13 +0,0 @@ -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) From 85e83512b083c351d673aa0fddae33c897adc50e Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 13:32:40 -0700 Subject: [PATCH 3/3] Updated BUILD dependency to use staging --- build/root/BUILD.root | 6 ------ pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/util/BUILD | 1 - vendor/modules.txt | 1 + 5 files changed, 3 insertions(+), 9 deletions(-) diff --git a/build/root/BUILD.root b/build/root/BUILD.root index 4ab7f316be6..41b76e68ba5 100644 --- a/build/root/BUILD.root +++ b/build/root/BUILD.root @@ -89,12 +89,6 @@ filegroup( "//cmd:all-srcs", "//docs:all-srcs", "//hack:all-srcs", - "//kubernetes/cluster:all-srcs", - "//kubernetes/docs:all-srcs", - "//kubernetes/hack:all-srcs", - "//kubernetes/test/e2e/testing-manifests:all-srcs", - "//kubernetes/test/images:all-srcs", - "//kubernetes/test/kubemark:all-srcs", "//pkg:all-srcs", "//plugin:all-srcs", "//staging:all-srcs", diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 5498c96edec..06d190db3fb 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/describe:go_default_library", "//pkg/kubectl/scheme:go_default_library", - "//pkg/kubectl/util/certificate:go_default_library", "//pkg/kubectl/util/fieldpath:go_default_library", "//pkg/kubectl/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -42,6 +41,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/reference:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library", diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index da9f59aaab8..b86a7296ca3 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -65,6 +65,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/reference" "k8s.io/klog" + "k8s.io/kubectl/pkg/util/certificate" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" "k8s.io/kubectl/pkg/util/qos" @@ -73,7 +74,6 @@ import ( storageutil "k8s.io/kubectl/pkg/util/storage" "k8s.io/kubernetes/pkg/kubectl/describe" "k8s.io/kubernetes/pkg/kubectl/scheme" - "k8s.io/kubernetes/pkg/kubectl/util/certificate" "k8s.io/kubernetes/pkg/kubectl/util/fieldpath" "k8s.io/kubernetes/pkg/kubectl/util/slice" ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index e6bd221c9e4..71177611279 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -66,7 +66,6 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/util/certificate:all-srcs", "//pkg/kubectl/util/fieldpath:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", diff --git a/vendor/modules.txt b/vendor/modules.txt index 417f6297ce0..c23e85b4925 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1636,6 +1636,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/util/certificate k8s.io/kubectl/pkg/util/deployment k8s.io/kubectl/pkg/util/event k8s.io/kubectl/pkg/util/hash