Merge pull request #82087 from soltysh/cp_back

Move kubectl cp back to k/k
This commit is contained in:
Kubernetes Prow Robot 2019-08-30 06:25:58 -07:00 committed by GitHub
commit 45522ebaca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 12 deletions

View File

@ -240,6 +240,7 @@ package_group(
"//pkg/kubectl/cmd", "//pkg/kubectl/cmd",
"//pkg/kubectl/cmd/auth", "//pkg/kubectl/cmd/auth",
"//pkg/kubectl/cmd/convert", "//pkg/kubectl/cmd/convert",
"//pkg/kubectl/cmd/cp",
"//pkg/kubectl/cmd/get", "//pkg/kubectl/cmd/get",
"//pkg/kubectl/explain", "//pkg/kubectl/explain",
"//staging/src/k8s.io/kubectl/pkg/cmd", "//staging/src/k8s.io/kubectl/pkg/cmd",

View File

@ -26,6 +26,7 @@ pkg/credentialprovider
pkg/credentialprovider/aws pkg/credentialprovider/aws
pkg/credentialprovider/azure pkg/credentialprovider/azure
pkg/kubeapiserver/admission pkg/kubeapiserver/admission
pkg/kubectl/cmd/cp
pkg/kubectl/cmd/get pkg/kubectl/cmd/get
pkg/kubelet/apis/podresources pkg/kubelet/apis/podresources
pkg/kubelet/cm/devicemanager 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/apply
vendor/k8s.io/kubectl/pkg/cmd/certificates vendor/k8s.io/kubectl/pkg/cmd/certificates
vendor/k8s.io/kubectl/pkg/cmd/config 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/edit
vendor/k8s.io/kubectl/pkg/cmd/exec vendor/k8s.io/kubectl/pkg/cmd/exec
vendor/k8s.io/kubectl/pkg/cmd/label vendor/k8s.io/kubectl/pkg/cmd/label

View File

@ -11,6 +11,7 @@ go_library(
deps = [ deps = [
"//pkg/kubectl/cmd/auth:go_default_library", "//pkg/kubectl/cmd/auth:go_default_library",
"//pkg/kubectl/cmd/convert:go_default_library", "//pkg/kubectl/cmd/convert:go_default_library",
"//pkg/kubectl/cmd/cp:go_default_library",
"//pkg/kubectl/cmd/get: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/cli-runtime/pkg/genericclioptions:go_default_library",
"//staging/src/k8s.io/client-go/tools/clientcmd: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/clusterinfo:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/cmd/completion: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/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/create:go_default_library",
"//staging/src/k8s.io/kubectl/pkg/cmd/delete: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", "//staging/src/k8s.io/kubectl/pkg/cmd/describe:go_default_library",
@ -85,6 +85,7 @@ filegroup(
":package-srcs", ":package-srcs",
"//pkg/kubectl/cmd/auth:all-srcs", "//pkg/kubectl/cmd/auth:all-srcs",
"//pkg/kubectl/cmd/convert:all-srcs", "//pkg/kubectl/cmd/convert:all-srcs",
"//pkg/kubectl/cmd/cp:all-srcs",
"//pkg/kubectl/cmd/get:all-srcs", "//pkg/kubectl/cmd/get:all-srcs",
"//pkg/kubectl/cmd/plugin/testdata:all-srcs", "//pkg/kubectl/cmd/plugin/testdata:all-srcs",
], ],

View File

@ -40,7 +40,6 @@ import (
"k8s.io/kubectl/pkg/cmd/clusterinfo" "k8s.io/kubectl/pkg/cmd/clusterinfo"
"k8s.io/kubectl/pkg/cmd/completion" "k8s.io/kubectl/pkg/cmd/completion"
cmdconfig "k8s.io/kubectl/pkg/cmd/config" cmdconfig "k8s.io/kubectl/pkg/cmd/config"
"k8s.io/kubectl/pkg/cmd/cp"
"k8s.io/kubectl/pkg/cmd/create" "k8s.io/kubectl/pkg/cmd/create"
"k8s.io/kubectl/pkg/cmd/delete" "k8s.io/kubectl/pkg/cmd/delete"
"k8s.io/kubectl/pkg/cmd/describe" "k8s.io/kubectl/pkg/cmd/describe"
@ -72,6 +71,7 @@ import (
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/auth"
"k8s.io/kubernetes/pkg/kubectl/cmd/convert" "k8s.io/kubernetes/pkg/kubectl/cmd/convert"
"k8s.io/kubernetes/pkg/kubectl/cmd/cp"
"k8s.io/kubernetes/pkg/kubectl/cmd/get" "k8s.io/kubernetes/pkg/kubectl/cmd/get"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"

View File

@ -3,8 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = ["cp.go"], srcs = ["cp.go"],
importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/cmd/cp", importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/cp",
importpath = "k8s.io/kubectl/pkg/cmd/cp",
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
"//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",

View File

@ -18,6 +18,7 @@ package cp
import ( import (
"archive/tar" "archive/tar"
"bytes"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -27,6 +28,9 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/lithammer/dedent"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
@ -34,11 +38,6 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"bytes"
"github.com/lithammer/dedent"
"github.com/spf13/cobra"
) )
var ( var (

View File

@ -36,7 +36,6 @@ filegroup(
"//staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo:all-srcs", "//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/completion:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/cmd/config: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/create:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/cmd/delete:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/delete:all-srcs",
"//staging/src/k8s.io/kubectl/pkg/cmd/describe:all-srcs", "//staging/src/k8s.io/kubectl/pkg/cmd/describe:all-srcs",

1
vendor/modules.txt vendored
View File

@ -1754,7 +1754,6 @@ k8s.io/kubectl/pkg/cmd/certificates
k8s.io/kubectl/pkg/cmd/clusterinfo k8s.io/kubectl/pkg/cmd/clusterinfo
k8s.io/kubectl/pkg/cmd/completion k8s.io/kubectl/pkg/cmd/completion
k8s.io/kubectl/pkg/cmd/config k8s.io/kubectl/pkg/cmd/config
k8s.io/kubectl/pkg/cmd/cp
k8s.io/kubectl/pkg/cmd/create k8s.io/kubectl/pkg/cmd/create
k8s.io/kubectl/pkg/cmd/delete k8s.io/kubectl/pkg/cmd/delete
k8s.io/kubectl/pkg/cmd/describe k8s.io/kubectl/pkg/cmd/describe