From 1b32dfdafdcd6cce21415c75385970a9ae5b0f01 Mon Sep 17 00:00:00 2001 From: knight42 Date: Mon, 15 Jun 2020 12:20:14 +0800 Subject: [PATCH] refactor: move kubectl-cp to staging Signed-off-by: knight42 --- build/visible_to/BUILD | 1 - pkg/kubectl/cmd/BUILD | 3 +-- pkg/kubectl/cmd/cmd.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/BUILD | 1 + {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/BUILD | 3 ++- {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp.go | 0 .../src/k8s.io/kubectl/pkg}/cmd/cp/cp_test.go | 0 vendor/modules.txt | 1 + 8 files changed, 6 insertions(+), 5 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/BUILD (94%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/cmd/cp/cp_test.go (100%) diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index fdccbd062bc..edfc4743525 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -238,7 +238,6 @@ package_group( "//pkg/kubectl/cmd", "//pkg/kubectl/cmd/auth", "//pkg/kubectl/cmd/convert", - "//pkg/kubectl/cmd/cp", "//pkg/kubectl/explain", "//staging/src/k8s.io/kubectl/pkg/cmd", "//staging/src/k8s.io/kubectl/pkg/cmd/annotate", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index cfe6b27d7e8..96acbf5d3c6 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -11,7 +11,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library", - "//pkg/kubectl/cmd/cp:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", @@ -26,6 +25,7 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/completion:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/config:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/create:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/delete:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/describe:go_default_library", @@ -86,7 +86,6 @@ filegroup( ":package-srcs", "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", - "//pkg/kubectl/cmd/cp:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 191d1a8c3ff..f0fced8adb6 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -41,6 +41,7 @@ import ( "k8s.io/kubectl/pkg/cmd/clusterinfo" "k8s.io/kubectl/pkg/cmd/completion" cmdconfig "k8s.io/kubectl/pkg/cmd/config" + "k8s.io/kubectl/pkg/cmd/cp" "k8s.io/kubectl/pkg/cmd/create" "k8s.io/kubectl/pkg/cmd/delete" "k8s.io/kubectl/pkg/cmd/describe" @@ -73,7 +74,6 @@ import ( "k8s.io/kubectl/pkg/util/term" "k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" - "k8s.io/kubernetes/pkg/kubectl/cmd/cp" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubectl/pkg/cmd/kustomize" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index dc15ca33874..f9f58902e1e 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -37,6 +37,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/completion:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/config:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/cmd/cp:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/create:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/debug:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/delete:all-srcs", diff --git a/pkg/kubectl/cmd/cp/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD similarity index 94% rename from pkg/kubectl/cmd/cp/BUILD rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD index 0d2c7f1f9f5..0b3bfcb57aa 100644 --- a/pkg/kubectl/cmd/cp/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["cp.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/cp", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/cp", + importpath = "k8s.io/kubectl/pkg/cmd/cp", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/pkg/kubectl/cmd/cp/cp.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go similarity index 100% rename from pkg/kubectl/cmd/cp/cp.go rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go diff --git a/pkg/kubectl/cmd/cp/cp_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go similarity index 100% rename from pkg/kubectl/cmd/cp/cp_test.go rename to staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 0b1af5e8a3b..98f98a0c7aa 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1776,6 +1776,7 @@ k8s.io/kubectl/pkg/cmd/certificates k8s.io/kubectl/pkg/cmd/clusterinfo k8s.io/kubectl/pkg/cmd/completion k8s.io/kubectl/pkg/cmd/config +k8s.io/kubectl/pkg/cmd/cp k8s.io/kubectl/pkg/cmd/create k8s.io/kubectl/pkg/cmd/debug k8s.io/kubectl/pkg/cmd/delete