diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index 2f71fa1cabf..41967e2f4c1 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -240,6 +240,7 @@ package_group( "//pkg/kubectl/cmd", "//pkg/kubectl/cmd/auth", "//pkg/kubectl/cmd/convert", + "//pkg/kubectl/cmd/cp", "//pkg/kubectl/cmd/get", "//pkg/kubectl/explain", "//staging/src/k8s.io/kubectl/pkg/cmd", diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 04638c9eda9..6d9f33f9d15 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -26,6 +26,7 @@ pkg/credentialprovider pkg/credentialprovider/aws pkg/credentialprovider/azure pkg/kubeapiserver/admission +pkg/kubectl/cmd/cp pkg/kubectl/cmd/get pkg/kubelet/apis/podresources pkg/kubelet/cm/devicemanager @@ -229,7 +230,6 @@ vendor/k8s.io/kubectl/pkg/cmd/annotate vendor/k8s.io/kubectl/pkg/cmd/apply vendor/k8s.io/kubectl/pkg/cmd/certificates vendor/k8s.io/kubectl/pkg/cmd/config -vendor/k8s.io/kubectl/pkg/cmd/cp vendor/k8s.io/kubectl/pkg/cmd/edit vendor/k8s.io/kubectl/pkg/cmd/exec vendor/k8s.io/kubectl/pkg/cmd/label diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 39f56ecef2d..9aa20b6298d 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -11,6 +11,7 @@ go_library( deps = [ "//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library", + "//pkg/kubectl/cmd/cp:go_default_library", "//pkg/kubectl/cmd/get:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", @@ -25,7 +26,6 @@ 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", @@ -85,6 +85,7 @@ filegroup( ":package-srcs", "//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs", + "//pkg/kubectl/cmd/cp:all-srcs", "//pkg/kubectl/cmd/get:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs", ], diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index 47df5729bdc..a19fe0be5f6 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -40,7 +40,6 @@ 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" @@ -72,6 +71,7 @@ import ( "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/convert" + "k8s.io/kubernetes/pkg/kubectl/cmd/cp" "k8s.io/kubernetes/pkg/kubectl/cmd/get" "k8s.io/cli-runtime/pkg/genericclioptions" diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD b/pkg/kubectl/cmd/cp/BUILD similarity index 94% rename from staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD rename to pkg/kubectl/cmd/cp/BUILD index 0b3bfcb57aa..0d2c7f1f9f5 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/BUILD +++ b/pkg/kubectl/cmd/cp/BUILD @@ -3,8 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["cp.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/cp", - importpath = "k8s.io/kubectl/pkg/cmd/cp", + importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/cp", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go b/pkg/kubectl/cmd/cp/cp.go similarity index 99% rename from staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go rename to pkg/kubectl/cmd/cp/cp.go index 1c7b0bf6ec5..64ef5143248 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go +++ b/pkg/kubectl/cmd/cp/cp.go @@ -18,6 +18,7 @@ package cp import ( "archive/tar" + "bytes" "errors" "fmt" "io" @@ -27,6 +28,9 @@ import ( "path/filepath" "strings" + "github.com/lithammer/dedent" + "github.com/spf13/cobra" + "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" @@ -34,11 +38,6 @@ import ( cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - - "bytes" - - "github.com/lithammer/dedent" - "github.com/spf13/cobra" ) var ( diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go b/pkg/kubectl/cmd/cp/cp_test.go similarity index 100% rename from staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go rename to pkg/kubectl/cmd/cp/cp_test.go diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD index cb806ec9ea9..ff8112d60c7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/BUILD @@ -36,7 +36,6 @@ 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/delete:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/describe:all-srcs", diff --git a/vendor/modules.txt b/vendor/modules.txt index 11c569833be..13402be8302 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1754,7 +1754,6 @@ 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/delete k8s.io/kubectl/pkg/cmd/describe