From d4a5b75a67f101959b706240c425fc283a4ac376 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 15:31:51 -0700 Subject: [PATCH 1/3] Move pkg/kubectl/util/event into staging --- pkg/kubectl/util/event/BUILD | 37 ------------------- .../pkg}/util/event/sorted_event_list.go | 0 .../pkg}/util/event/sorted_event_list_test.go | 0 3 files changed, 37 deletions(-) delete mode 100644 pkg/kubectl/util/event/BUILD rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/event/sorted_event_list.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/event/sorted_event_list_test.go (100%) diff --git a/pkg/kubectl/util/event/BUILD b/pkg/kubectl/util/event/BUILD deleted file mode 100644 index 1c0fe6300d3..00000000000 --- a/pkg/kubectl/util/event/BUILD +++ /dev/null @@ -1,37 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) - -go_library( - name = "go_default_library", - srcs = ["sorted_event_list.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/event", - deps = ["//staging/src/k8s.io/api/core/v1:go_default_library"], -) - -go_test( - name = "go_default_test", - srcs = ["sorted_event_list_test.go"], - embed = [":go_default_library"], - deps = [ - "//staging/src/k8s.io/api/core/v1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", - ], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/pkg/kubectl/util/event/sorted_event_list.go b/staging/src/k8s.io/kubectl/pkg/util/event/sorted_event_list.go similarity index 100% rename from pkg/kubectl/util/event/sorted_event_list.go rename to staging/src/k8s.io/kubectl/pkg/util/event/sorted_event_list.go diff --git a/pkg/kubectl/util/event/sorted_event_list_test.go b/staging/src/k8s.io/kubectl/pkg/util/event/sorted_event_list_test.go similarity index 100% rename from pkg/kubectl/util/event/sorted_event_list_test.go rename to staging/src/k8s.io/kubectl/pkg/util/event/sorted_event_list_test.go From f7a443f3162b1209ff4b89adc25f6e9587a8a7b1 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 19 Jun 2019 15:33:12 -0700 Subject: [PATCH 2/3] Update imports after moving util/event to staging --- pkg/kubectl/describe/versioned/describe.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index 532c29092c0..fefa3b507af 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -66,11 +66,11 @@ import ( "k8s.io/client-go/tools/reference" "k8s.io/klog" deploymentutil "k8s.io/kubectl/pkg/util/deployment" + "k8s.io/kubectl/pkg/util/event" "k8s.io/kubectl/pkg/util/rbac" "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/event" "k8s.io/kubernetes/pkg/kubectl/util/fieldpath" "k8s.io/kubernetes/pkg/kubectl/util/qos" resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource" From 949060dac0918c2f348736b567e5e172f58d3a97 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Tue, 25 Jun 2019 15:22:20 -0700 Subject: [PATCH 3/3] Dependency changes --- pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + .../src/k8s.io/kubectl/pkg/util/event/BUILD | 34 +++++++++++++++++++ vendor/modules.txt | 1 + 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 staging/src/k8s.io/kubectl/pkg/util/event/BUILD diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 8eb3a9dacb7..a23e5ee0818 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -9,7 +9,6 @@ go_library( "//pkg/kubectl/describe:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/certificate:go_default_library", - "//pkg/kubectl/util/event:go_default_library", "//pkg/kubectl/util/fieldpath:go_default_library", "//pkg/kubectl/util/qos:go_default_library", "//pkg/kubectl/util/resource:go_default_library", @@ -47,6 +46,7 @@ go_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/deployment:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//vendor/github.com/fatih/camelcase:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 0bd3b8f560c..27f6934ec93 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -67,7 +67,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/kubectl/util/certificate:all-srcs", - "//pkg/kubectl/util/event:all-srcs", "//pkg/kubectl/util/fieldpath:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 7868b8c4d07..bcc84c3abf8 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/deployment:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", diff --git a/staging/src/k8s.io/kubectl/pkg/util/event/BUILD b/staging/src/k8s.io/kubectl/pkg/util/event/BUILD new file mode 100644 index 00000000000..1026bf06bf8 --- /dev/null +++ b/staging/src/k8s.io/kubectl/pkg/util/event/BUILD @@ -0,0 +1,34 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") + +go_library( + name = "go_default_library", + srcs = ["sorted_event_list.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/event", + importpath = "k8s.io/kubectl/pkg/util/event", + visibility = ["//visibility:public"], + deps = ["//staging/src/k8s.io/api/core/v1:go_default_library"], +) + +go_test( + name = "go_default_test", + srcs = ["sorted_event_list_test.go"], + embed = [":go_default_library"], + deps = [ + "//staging/src/k8s.io/api/core/v1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1: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 b456628be35..44432d2157d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1636,6 +1636,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/deployment +k8s.io/kubectl/pkg/util/event k8s.io/kubectl/pkg/util/hash k8s.io/kubectl/pkg/util/interrupt k8s.io/kubectl/pkg/util/podutils