From d8362f750809b5ab6c1bcc41eabdf1945d96035e Mon Sep 17 00:00:00 2001 From: Peter Swica Date: Fri, 7 Jun 2019 01:13:40 -0400 Subject: [PATCH] Moving pkg/kubectl/util/storage to staging --- pkg/kubectl/describe/versioned/BUILD | 2 +- pkg/kubectl/describe/versioned/describe.go | 2 +- pkg/kubectl/util/BUILD | 1 - staging/src/k8s.io/kubectl/BUILD | 1 + .../src/k8s.io/kubectl/pkg}/util/storage/BUILD | 3 ++- .../src/k8s.io/kubectl/pkg}/util/storage/storage.go | 0 vendor/modules.txt | 1 + 7 files changed, 6 insertions(+), 4 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/storage/BUILD (82%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/storage/storage.go (100%) diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD index a23e5ee0818..822b65a1223 100644 --- a/pkg/kubectl/describe/versioned/BUILD +++ b/pkg/kubectl/describe/versioned/BUILD @@ -13,7 +13,6 @@ go_library( "//pkg/kubectl/util/qos:go_default_library", "//pkg/kubectl/util/resource:go_default_library", "//pkg/kubectl/util/slice:go_default_library", - "//pkg/kubectl/util/storage: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", @@ -48,6 +47,7 @@ go_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", + "//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 fefa3b507af..d848b27cb5a 100644 --- a/pkg/kubectl/describe/versioned/describe.go +++ b/pkg/kubectl/describe/versioned/describe.go @@ -68,6 +68,7 @@ import ( deploymentutil "k8s.io/kubectl/pkg/util/deployment" "k8s.io/kubectl/pkg/util/event" "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" @@ -75,7 +76,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/util/qos" resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource" "k8s.io/kubernetes/pkg/kubectl/util/slice" - storageutil "k8s.io/kubernetes/pkg/kubectl/util/storage" ) // Each level has 2 spaces for PrefixWriter diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 27f6934ec93..3239fdde8e9 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -73,7 +73,6 @@ filegroup( "//pkg/kubectl/util/qos:all-srcs", "//pkg/kubectl/util/resource:all-srcs", "//pkg/kubectl/util/slice:all-srcs", - "//pkg/kubectl/util/storage: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 bcc84c3abf8..45892af1360 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -16,6 +16,7 @@ filegroup( "//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/rbac: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/storage/BUILD b/staging/src/k8s.io/kubectl/pkg/util/storage/BUILD similarity index 82% rename from pkg/kubectl/util/storage/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/storage/BUILD index cd1ed24f700..a1d53780427 100644 --- a/pkg/kubectl/util/storage/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/storage/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["storage.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/storage", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/storage", + importpath = "k8s.io/kubectl/pkg/util/storage", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubectl/util/storage/storage.go b/staging/src/k8s.io/kubectl/pkg/util/storage/storage.go similarity index 100% rename from pkg/kubectl/util/storage/storage.go rename to staging/src/k8s.io/kubectl/pkg/util/storage/storage.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 5815985cfab..cfc2ce50cb5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1643,6 +1643,7 @@ k8s.io/kubectl/pkg/util/interrupt k8s.io/kubectl/pkg/util/podutils k8s.io/kubectl/pkg/util/printers k8s.io/kubectl/pkg/util/rbac +k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term # k8s.io/kubelet v0.0.0 => ./staging/src/k8s.io/kubelet