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/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" 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/pkg/kubectl/util/event/BUILD b/staging/src/k8s.io/kubectl/pkg/util/event/BUILD similarity index 71% rename from pkg/kubectl/util/event/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/event/BUILD index 1c0fe6300d3..1026bf06bf8 100644 --- a/pkg/kubectl/util/event/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/event/BUILD @@ -1,15 +1,11 @@ -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 = ["sorted_event_list.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/event", + 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"], ) @@ -34,4 +30,5 @@ filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], + visibility = ["//visibility:public"], ) 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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 2c6c3ac8e6a..5815985cfab 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1637,6 +1637,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