github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update import statements to reflect code move

Browse Source
This commit is contained in:
Sean Sullivan 2019-08-01 11:10:05 -07:00
parent 0e0ea52339
commit acece3c296
57 changed files with 101 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/auth/cani_test.go
View File

@ -31,7 +31,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestRunAccessCheck(t *testing.T) { func TestRunAccessCheck(t *testing.T) {

74
pkg/kubectl/cmd/cmd.go
View File

@ -30,51 +30,51 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
cliflag "k8s.io/component-base/cli/flag" cliflag "k8s.io/component-base/cli/flag"
"k8s.io/kubectl/pkg/cmd/annotate"
"k8s.io/kubectl/pkg/cmd/apiresources"
"k8s.io/kubectl/pkg/cmd/apply"
"k8s.io/kubectl/pkg/cmd/attach"
"k8s.io/kubectl/pkg/cmd/autoscale"
"k8s.io/kubectl/pkg/cmd/certificates"
"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"
"k8s.io/kubectl/pkg/cmd/diff"
"k8s.io/kubectl/pkg/cmd/drain"
"k8s.io/kubectl/pkg/cmd/edit"
cmdexec "k8s.io/kubectl/pkg/cmd/exec"
"k8s.io/kubectl/pkg/cmd/explain"
"k8s.io/kubectl/pkg/cmd/expose"
"k8s.io/kubectl/pkg/cmd/label"
"k8s.io/kubectl/pkg/cmd/logs"
"k8s.io/kubectl/pkg/cmd/options"
"k8s.io/kubectl/pkg/cmd/patch"
"k8s.io/kubectl/pkg/cmd/plugin"
"k8s.io/kubectl/pkg/cmd/portforward"
"k8s.io/kubectl/pkg/cmd/proxy"
"k8s.io/kubectl/pkg/cmd/replace"
"k8s.io/kubectl/pkg/cmd/rollingupdate"
"k8s.io/kubectl/pkg/cmd/rollout"
"k8s.io/kubectl/pkg/cmd/run"
"k8s.io/kubectl/pkg/cmd/scale"
"k8s.io/kubectl/pkg/cmd/set"
"k8s.io/kubectl/pkg/cmd/taint"
"k8s.io/kubectl/pkg/cmd/top"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/cmd/version"
"k8s.io/kubectl/pkg/cmd/wait"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/annotate"
"k8s.io/kubernetes/pkg/kubectl/cmd/apiresources"
"k8s.io/kubernetes/pkg/kubectl/cmd/apply"
"k8s.io/kubernetes/pkg/kubectl/cmd/attach"
"k8s.io/kubernetes/pkg/kubectl/cmd/auth" "k8s.io/kubernetes/pkg/kubectl/cmd/auth"
"k8s.io/kubernetes/pkg/kubectl/cmd/autoscale"
"k8s.io/kubernetes/pkg/kubectl/cmd/certificates"
"k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo"
"k8s.io/kubernetes/pkg/kubectl/cmd/completion"
cmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"
"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/create"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete"
"k8s.io/kubernetes/pkg/kubectl/cmd/describe"
"k8s.io/kubernetes/pkg/kubectl/cmd/diff"
"k8s.io/kubernetes/pkg/kubectl/cmd/drain"
"k8s.io/kubernetes/pkg/kubectl/cmd/edit"
cmdexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec"
"k8s.io/kubernetes/pkg/kubectl/cmd/explain"
"k8s.io/kubernetes/pkg/kubectl/cmd/expose"
"k8s.io/kubernetes/pkg/kubectl/cmd/get" "k8s.io/kubernetes/pkg/kubectl/cmd/get"
"k8s.io/kubernetes/pkg/kubectl/cmd/label"
"k8s.io/kubernetes/pkg/kubectl/cmd/logs"
"k8s.io/kubernetes/pkg/kubectl/cmd/options"
"k8s.io/kubernetes/pkg/kubectl/cmd/patch"
"k8s.io/kubernetes/pkg/kubectl/cmd/plugin"
"k8s.io/kubernetes/pkg/kubectl/cmd/portforward"
"k8s.io/kubernetes/pkg/kubectl/cmd/proxy"
"k8s.io/kubernetes/pkg/kubectl/cmd/replace"
"k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate"
"k8s.io/kubernetes/pkg/kubectl/cmd/rollout"
"k8s.io/kubernetes/pkg/kubectl/cmd/run"
"k8s.io/kubernetes/pkg/kubectl/cmd/scale"
"k8s.io/kubernetes/pkg/kubectl/cmd/set"
"k8s.io/kubernetes/pkg/kubectl/cmd/taint"
"k8s.io/kubernetes/pkg/kubectl/cmd/top"
"k8s.io/kubernetes/pkg/kubectl/cmd/version"
"k8s.io/kubernetes/pkg/kubectl/cmd/wait"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/cmd/kustomize" "k8s.io/kubectl/pkg/cmd/kustomize"
) )
const ( const (

2
pkg/kubectl/cmd/convert/convert_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type testcase struct { type testcase struct {

2
pkg/kubectl/cmd/get/get_test.go
View File

@ -50,7 +50,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
openapitesting "k8s.io/kubectl/pkg/util/openapi/testing" openapitesting "k8s.io/kubectl/pkg/util/openapi/testing"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
var ( var (

2
staging/src/k8s.io/kubectl/pkg/cmd/annotate/annotate_test.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestValidateAnnotationOverwrites(t *testing.T) { func TestValidateAnnotationOverwrites(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
View File

@ -53,7 +53,7 @@ import (
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubectl/pkg/validation" "k8s.io/kubectl/pkg/validation"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubectl/pkg/cmd/delete"
) )
// ApplyOptions defines flags and other configuration parameters for the `apply` command // ApplyOptions defines flags and other configuration parameters for the `apply` command

2
staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go
View File

@ -49,7 +49,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
) )

2
staging/src/k8s.io/kubectl/pkg/cmd/attach/attach.go
View File

@ -36,7 +36,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubectl/pkg/cmd/exec"
) )
var ( var (

4
staging/src/k8s.io/kubectl/pkg/cmd/attach/attach_test.go
View File

@ -35,8 +35,8 @@ import (
"k8s.io/client-go/tools/remotecommand" "k8s.io/client-go/tools/remotecommand"
"k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/polymorphichelpers"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubectl/pkg/cmd/exec"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type fakeRemoteAttach struct { type fakeRemoteAttach struct {

2
staging/src/k8s.io/kubectl/pkg/cmd/clusterinfo/clusterinfo_dump_test.go
View File

@ -23,7 +23,7 @@ import (
"testing" "testing"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestSetupOutputWriterNoOp(t *testing.T) { func TestSetupOutputWriterNoOp(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/cp/cp.go
View File

@ -33,7 +33,7 @@ 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"
"k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubectl/pkg/cmd/exec"
"bytes" "bytes"

4
staging/src/k8s.io/kubectl/pkg/cmd/cp/cp_test.go
View File

@ -40,8 +40,8 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
kexec "k8s.io/kubernetes/pkg/kubectl/cmd/exec" kexec "k8s.io/kubectl/pkg/cmd/exec"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type FileType int type FileType int

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateClusterRole(t *testing.T) { func TestCreateClusterRole(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrolebinding_test.go
View File

@ -32,7 +32,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateClusterRoleBinding(t *testing.T) { func TestCreateClusterRoleBinding(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_configmap_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateConfigMap(t *testing.T) { func TestCreateConfigMap(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_deployment_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
generateversioned "k8s.io/kubectl/pkg/generate/versioned" generateversioned "k8s.io/kubectl/pkg/generate/versioned"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func Test_generatorFromName(t *testing.T) { func Test_generatorFromName(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_namespace_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateNamespace(t *testing.T) { func TestCreateNamespace(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go
View File

@ -27,7 +27,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreatePdb(t *testing.T) { func TestCreatePdb(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go
View File

@ -27,7 +27,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreatePriorityClass(t *testing.T) { func TestCreatePriorityClass(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_quota_test.go
View File

@ -21,7 +21,7 @@ import (
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateQuota(t *testing.T) { func TestCreateQuota(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go
View File

@ -28,7 +28,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateRole(t *testing.T) { func TestCreateRole(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_rolebinding_test.go
View File

@ -32,7 +32,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"} var groupVersion = schema.GroupVersion{Group: "rbac.authorization.k8s.io", Version: "v1"}

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_secret_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateSecretGeneric(t *testing.T) { func TestCreateSecretGeneric(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_service_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateService(t *testing.T) { func TestCreateService(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_serviceaccount_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestCreateServiceAccount(t *testing.T) { func TestCreateServiceAccount(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/create/create_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestExtraArgsFail(t *testing.T) { func TestExtraArgsFail(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/delete/delete.go
View File

@ -37,7 +37,7 @@ import (
"k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/rawhttp"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
cmdwait "k8s.io/kubernetes/pkg/kubectl/cmd/wait" cmdwait "k8s.io/kubectl/pkg/cmd/wait"
) )
var ( var (

2
staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func fakecmd() *cobra.Command { func fakecmd() *cobra.Command {

2
staging/src/k8s.io/kubectl/pkg/cmd/describe/describe_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubectl/pkg/describe" "k8s.io/kubectl/pkg/describe"
versioneddescribe "k8s.io/kubectl/pkg/describe/versioned" versioneddescribe "k8s.io/kubectl/pkg/describe/versioned"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
// Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get. // Verifies that schemas that are not in the master tree of Kubernetes can be retrieved via Get.

2
staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go
View File

@ -42,7 +42,7 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/apply" "k8s.io/kubectl/pkg/cmd/apply"
"k8s.io/utils/exec" "k8s.io/utils/exec"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
) )

2
staging/src/k8s.io/kubectl/pkg/cmd/drain/drain_test.go
View File

@ -50,7 +50,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/drain"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
utilpointer "k8s.io/utils/pointer" utilpointer "k8s.io/utils/pointer"
) )

6
staging/src/k8s.io/kubectl/pkg/cmd/edit/edit_test.go
View File

@ -39,9 +39,9 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/apply" "k8s.io/kubectl/pkg/cmd/apply"
"k8s.io/kubernetes/pkg/kubectl/cmd/create" "k8s.io/kubectl/pkg/cmd/create"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type EditTestCase struct { type EditTestCase struct {

2
staging/src/k8s.io/kubectl/pkg/cmd/exec/exec_test.go
View File

@ -37,7 +37,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/term" "k8s.io/kubectl/pkg/util/term"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type fakeRemoteExecutor struct { type fakeRemoteExecutor struct {

2
staging/src/k8s.io/kubectl/pkg/cmd/expose/expose_test.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestRunExposeService(t *testing.T) { func TestRunExposeService(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestValidateLabels(t *testing.T) { func TestValidateLabels(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/logs/logs_test.go
View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestLog(t *testing.T) { func TestLog(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/patch/patch_test.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestPatchObject(t *testing.T) { func TestPatchObject(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/portforward/portforward_test.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
type fakePortForwarder struct { type fakePortForwarder struct {

2
staging/src/k8s.io/kubectl/pkg/cmd/replace/replace.go
View File

@ -41,7 +41,7 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubectl/pkg/validation" "k8s.io/kubectl/pkg/validation"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubectl/pkg/cmd/delete"
) )
var ( var (

2
staging/src/k8s.io/kubectl/pkg/cmd/replace/replace_test.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestReplaceObject(t *testing.T) { func TestReplaceObject(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/rollingupdate/rollingupdate_test.go
View File

@ -20,7 +20,7 @@ import (
"testing" "testing"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestValidateArgs(t *testing.T) { func TestValidateArgs(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/set" "k8s.io/kubectl/pkg/cmd/set"
) )
// PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of // PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of

2
staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_pause_test.go
View File

@ -31,7 +31,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"} var rolloutPauseGroupVersionEncoder = schema.GroupVersion{Group: "extensions", Version: "v1beta1"}

2
staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_restart.go
View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/set" "k8s.io/kubectl/pkg/cmd/set"
) )
// RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of // RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of

2
staging/src/k8s.io/kubectl/pkg/cmd/rollout/rollout_resume.go
View File

@ -31,7 +31,7 @@ import (
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/set" "k8s.io/kubectl/pkg/cmd/set"
) )
// ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of // ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of

8
staging/src/k8s.io/kubectl/pkg/cmd/run/run.go
View File

@ -50,10 +50,10 @@ import (
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/interrupt"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/attach" "k8s.io/kubectl/pkg/cmd/attach"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubectl/pkg/cmd/delete"
"k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubectl/pkg/cmd/exec"
"k8s.io/kubernetes/pkg/kubectl/cmd/logs" "k8s.io/kubectl/pkg/cmd/logs"
uexec "k8s.io/utils/exec" uexec "k8s.io/utils/exec"
) )

4
staging/src/k8s.io/kubectl/pkg/cmd/run/run_test.go
View File

@ -39,8 +39,8 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubectl/pkg/cmd/delete"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestGetRestartPolicy(t *testing.T) { func TestGetRestartPolicy(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_env.go
View File

@ -38,7 +38,7 @@ import (
"k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/polymorphichelpers"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/templates"
envutil "k8s.io/kubernetes/pkg/kubectl/cmd/set/env" envutil "k8s.io/kubectl/pkg/cmd/set/env"
) )
var ( var (

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_env_test.go
View File

@ -38,7 +38,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestSetEnvLocal(t *testing.T) { func TestSetEnvLocal(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_image_test.go
View File

@ -39,7 +39,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestImageLocal(t *testing.T) { func TestImageLocal(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_resources_test.go
View File

@ -38,7 +38,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestResourcesLocal(t *testing.T) { func TestResourcesLocal(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_serviceaccount_test.go
View File

@ -38,7 +38,7 @@ import (
restclient "k8s.io/client-go/rest" restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
const ( const (

2
staging/src/k8s.io/kubectl/pkg/cmd/set/set_subject_test.go
View File

@ -24,7 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/resource" "k8s.io/cli-runtime/pkg/resource"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func TestValidate(t *testing.T) { func TestValidate(t *testing.T) {

2
staging/src/k8s.io/kubectl/pkg/cmd/taint/taint_test.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
) )
func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) { func generateNodeAndTaintedNode(oldTaints []corev1.Taint, newTaints []corev1.Taint) (*corev1.Node, *corev1.Node) {

2
staging/src/k8s.io/kubectl/pkg/cmd/top/top_node_test.go
View File

@ -32,7 +32,7 @@ import (
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake"

2
staging/src/k8s.io/kubectl/pkg/cmd/top/top_pod_test.go
View File

@ -38,7 +38,7 @@ import (
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/scheme"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake" metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake"

2
staging/src/k8s.io/kubectl/pkg/cmd/top/top_test.go
View File

@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubectl/pkg/cmd/testing"
metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1" metricsv1alpha1api "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
) )