Update import statements to reflect code move

Kubernetes-commit: acece3c2964115a4f29a43e368ad5de59dbbc258
This commit is contained in:
Sean Sullivan 2019-08-01 11:10:05 -07:00 committed by Kubernetes Publisher
parent c6063dd846
commit 5b48717f2d
53 changed files with 61 additions and 61 deletions

View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -53,7 +53,7 @@ import (
"k8s.io/kubectl/pkg/util/openapi"
"k8s.io/kubectl/pkg/util/templates"
"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

View File

@ -49,7 +49,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/scheme"
"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"
)

View File

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

View File

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

View File

@ -23,7 +23,7 @@ import (
"testing"
"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) {

View File

@ -33,7 +33,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/i18n"
"k8s.io/kubectl/pkg/util/templates"
"k8s.io/kubernetes/pkg/kubectl/cmd/exec"
"k8s.io/kubectl/pkg/cmd/exec"
"bytes"

View File

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

View File

@ -26,7 +26,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -32,7 +32,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -29,7 +29,7 @@ import (
"k8s.io/client-go/rest/fake"
generateversioned "k8s.io/kubectl/pkg/generate/versioned"
"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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -27,7 +27,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -27,7 +27,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -21,7 +21,7 @@ import (
"k8s.io/api/core/v1"
"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) {

View File

@ -28,7 +28,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -32,7 +32,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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"}

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"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) {

View File

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

View File

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

View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubectl/pkg/describe"
versioneddescribe "k8s.io/kubectl/pkg/describe/versioned"
"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.

View File

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

View File

@ -50,7 +50,7 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/drain"
"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"
)

View File

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

View File

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

View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -30,7 +30,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/genericclioptions"
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) {

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"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) {

View File

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

View File

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

View File

@ -26,7 +26,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -20,7 +20,7 @@ import (
"testing"
"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) {

View File

@ -31,7 +31,7 @@ import (
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n"
"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

View File

@ -31,7 +31,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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"}

View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n"
"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

View File

@ -31,7 +31,7 @@ import (
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/i18n"
"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

View File

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

View File

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

View File

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

View File

@ -38,7 +38,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -39,7 +39,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

@ -38,7 +38,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
"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) {

View File

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

View File

@ -24,7 +24,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"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) {

View File

@ -32,7 +32,7 @@ import (
"k8s.io/client-go/rest/fake"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"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) {

View File

@ -32,7 +32,7 @@ import (
"k8s.io/client-go/rest/fake"
core "k8s.io/client-go/testing"
"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"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake"

View File

@ -38,7 +38,7 @@ import (
core "k8s.io/client-go/testing"
cmdutil "k8s.io/kubectl/pkg/cmd/util"
"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"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
metricsfake "k8s.io/metrics/pkg/client/clientset/versioned/fake"

View File

@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"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"
metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1"
)