diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 9c3ea11028e..df624ede8e7 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -62,7 +62,6 @@ go_library( "//pkg/kubectl/describe/versioned:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util: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", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -88,6 +87,7 @@ go_library( "//staging/src/k8s.io/client-go/util/retry:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/slice:go_default_library", "//vendor/k8s.io/utils/integer:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 8fefd4813ed..631224f05dd 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/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v2beta2:go_default_library", @@ -47,6 +46,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/resource:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/slice:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/storage: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 119946cb1a4..3fab8ff0362 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -72,10 +72,10 @@ import ( "k8s.io/kubectl/pkg/util/qos" "k8s.io/kubectl/pkg/util/rbac" resourcehelper "k8s.io/kubectl/pkg/util/resource" + "k8s.io/kubectl/pkg/util/slice" 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/slice" ) // Each level has 2 spaces for PrefixWriter diff --git a/pkg/kubectl/history.go b/pkg/kubectl/history.go index 382c6dd4463..b6c8e145576 100644 --- a/pkg/kubectl/history.go +++ b/pkg/kubectl/history.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/kubernetes" clientappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1" deploymentutil "k8s.io/kubectl/pkg/util/deployment" + sliceutil "k8s.io/kubectl/pkg/util/slice" kapps "k8s.io/kubernetes/pkg/kubectl/apps" describe "k8s.io/kubernetes/pkg/kubectl/describe/versioned" - sliceutil "k8s.io/kubernetes/pkg/kubectl/util/slice" ) const ( diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 098352f6b35..adc4394e555 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -68,7 +68,6 @@ filegroup( ":package-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", - "//pkg/kubectl/util/slice:all-srcs", ], tags = ["automanaged"], visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"], diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index eb57a39e8eb..2fed2c8d392 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -20,6 +20,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/slice:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/storage: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/pkg/kubectl/util/slice/BUILD b/staging/src/k8s.io/kubectl/pkg/util/slice/BUILD similarity index 81% rename from pkg/kubectl/util/slice/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/slice/BUILD index c786caaf9cf..7476a1581ba 100644 --- a/pkg/kubectl/util/slice/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/slice/BUILD @@ -9,7 +9,8 @@ load( go_library( name = "go_default_library", srcs = ["slice.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/slice", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/slice", + importpath = "k8s.io/kubectl/pkg/util/slice", ) go_test( diff --git a/pkg/kubectl/util/slice/slice.go b/staging/src/k8s.io/kubectl/pkg/util/slice/slice.go similarity index 100% rename from pkg/kubectl/util/slice/slice.go rename to staging/src/k8s.io/kubectl/pkg/util/slice/slice.go diff --git a/pkg/kubectl/util/slice/slice_test.go b/staging/src/k8s.io/kubectl/pkg/util/slice/slice_test.go similarity index 100% rename from pkg/kubectl/util/slice/slice_test.go rename to staging/src/k8s.io/kubectl/pkg/util/slice/slice_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 32e224fe70c..705a9f869ef 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1647,6 +1647,7 @@ k8s.io/kubectl/pkg/util/printers k8s.io/kubectl/pkg/util/qos k8s.io/kubectl/pkg/util/rbac k8s.io/kubectl/pkg/util/resource +k8s.io/kubectl/pkg/util/slice k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term