diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index 822b65a1223..c01ce6142ed 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -10,7 +10,6 @@ go_library( "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/certificate:go_default_library", "//pkg/kubectl/util/fieldpath:go_default_library", - "//pkg/kubectl/util/qos:go_default_library", "//pkg/kubectl/util/resource:go_default_library", "//pkg/kubectl/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -46,6 +45,7 @@ go_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/qos:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/storage:go_default_library", "//vendor/github.com/fatih/camelcase:go_default_library", diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go index d848b27cb5a..e9c824a180c 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -67,13 +67,13 @@ import ( "k8s.io/klog" deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" + "k8s.io/kubectl/pkg/util/qos" "k8s.io/kubectl/pkg/util/rbac" 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/qos" resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource" "k8s.io/kubernetes/pkg/kubectl/util/slice" ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 3239fdde8e9..130e5d1b8ab 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -70,7 +70,6 @@ filegroup( "//pkg/kubectl/util/fieldpath:all-srcs", "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", - "//pkg/kubectl/util/qos:all-srcs", "//pkg/kubectl/util/resource:all-srcs", "//pkg/kubectl/util/slice:all-srcs", ], diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 45892af1360..8f0094b68ef 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -15,6 +15,7 @@ filegroup( "//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/qos:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/storage:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/templates:all-srcs", diff --git a/pkg/kubectl/util/qos/BUILD b/staging/src/k8s.io/kubectl/pkg/util/qos/BUILD similarity index 85% rename from pkg/kubectl/util/qos/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/qos/BUILD index bed95210fc2..244b748b682 100644 --- a/pkg/kubectl/util/qos/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/qos/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["qos.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/qos", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/qos", + importpath = "k8s.io/kubectl/pkg/util/qos", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubectl/util/qos/qos.go b/staging/src/k8s.io/kubectl/pkg/util/qos/qos.go similarity index 100% rename from pkg/kubectl/util/qos/qos.go rename to staging/src/k8s.io/kubectl/pkg/util/qos/qos.go diff --git a/vendor/modules.txt b/vendor/modules.txt index cfc2ce50cb5..0afcb804ed4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1642,6 +1642,7 @@ k8s.io/kubectl/pkg/util/hash k8s.io/kubectl/pkg/util/interrupt k8s.io/kubectl/pkg/util/podutils k8s.io/kubectl/pkg/util/printers +k8s.io/kubectl/pkg/util/qos k8s.io/kubectl/pkg/util/rbac k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates