Update all imports to scheme in staging

This commit is contained in:
Sean Sullivan 2019-06-25 22:16:36 -07:00
parent be3b2cc1a4
commit 140c62cd4c
92 changed files with 99 additions and 92 deletions

View File

@ -38,7 +38,7 @@ import (
"k8s.io/client-go/util/workqueue"
"k8s.io/kubernetes/pkg/controller"
jobutil "k8s.io/kubernetes/pkg/controller/job"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/util/metrics"
)

View File

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

View File

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

View File

@ -52,7 +52,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/delete"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -33,7 +33,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -35,7 +35,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/exec"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -36,7 +36,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/exec"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
type fakeRemoteAttach struct {

View File

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

View File

@ -34,7 +34,7 @@ import (
rbacv1client "k8s.io/client-go/kubernetes/typed/rbac/v1"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/registry/rbac/reconciliation"
)

View File

@ -34,7 +34,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/generate"
generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -32,7 +32,7 @@ import (
certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -29,7 +29,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
ct "github.com/daviddengcn/go-colortext"

View File

@ -34,7 +34,7 @@ import (
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -29,7 +29,7 @@ import (
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -41,7 +41,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor"
"k8s.io/kubernetes/pkg/kubectl/generate"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

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

View File

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

View File

@ -31,7 +31,7 @@ import (
batchv1beta1client "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
var (

View File

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

View File

@ -32,7 +32,7 @@ import (
batchv1client "k8s.io/client-go/kubernetes/typed/batch/v1"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

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

View File

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

View File

@ -32,7 +32,7 @@ import (
clientgorbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -32,7 +32,7 @@ import (
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/rest/fake"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
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"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func TestCreateSecretGeneric(t *testing.T) {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -39,7 +39,7 @@ import (
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/drain"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -37,7 +37,7 @@ import (
"k8s.io/kubectl/pkg/util/term"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -39,7 +39,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/generate"
generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -25,7 +25,7 @@ import (
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
var columnsFormats = map[string]bool{

View File

@ -26,7 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubectl/pkg/util/printers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
// UniversalDecoder call must specify parameter versions; otherwise it will decode to internal versions.

View File

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

View File

@ -29,7 +29,7 @@ import (
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func toUnstructuredOrDie(data []byte) *unstructured.Unstructured {

View File

@ -39,7 +39,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -35,7 +35,7 @@ import (
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -38,7 +38,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

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

View File

@ -40,7 +40,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
"k8s.io/kubernetes/pkg/kubectl/cmd/delete"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -38,7 +38,7 @@ import (
"k8s.io/kubectl/pkg/validation"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -27,7 +27,7 @@ import (
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/set"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -29,7 +29,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/set"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/set"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -40,7 +40,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -27,7 +27,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -51,7 +51,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/generate"
generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
uexec "k8s.io/utils/exec"
)

View File

@ -39,7 +39,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl/cmd/delete"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

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

View File

@ -32,7 +32,7 @@ import (
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -33,7 +33,7 @@ import (
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned"
"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -32,7 +32,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

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

View File

@ -32,7 +32,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

@ -35,7 +35,7 @@ import (
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/kubectl/pkg/util/templates"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/i18n"
)

View File

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

View File

@ -44,12 +44,13 @@ import (
scaleclient "k8s.io/client-go/scale"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/validation"
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
openapitesting "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/validation"
)
// InternalType is the schema for internal type

View File

@ -29,7 +29,7 @@ import (
runtime "k8s.io/apimachinery/pkg/runtime"
restclient "k8s.io/client-go/rest"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
var (

View File

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

@ -49,7 +49,7 @@ import (
"k8s.io/kubernetes/pkg/kubectl"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/editor/crlf"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
// EditOptions contains all the options for running edit cli command.

View File

@ -33,7 +33,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/diff"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/utils/exec"
)

View File

@ -26,7 +26,7 @@ import (
"k8s.io/client-go/discovery"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/cli-runtime/pkg/genericclioptions"
"k8s.io/kubernetes/pkg/kubectl/version"

View File

@ -65,6 +65,7 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/reference"
"k8s.io/klog"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubectl/pkg/util/certificate"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
"k8s.io/kubectl/pkg/util/event"
@ -75,7 +76,12 @@ import (
"k8s.io/kubectl/pkg/util/slice"
storageutil "k8s.io/kubectl/pkg/util/storage"
"k8s.io/kubernetes/pkg/kubectl/describe"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubernetes/pkg/kubectl/util/certificate"
"k8s.io/kubernetes/pkg/kubectl/util/fieldpath"
"k8s.io/kubernetes/pkg/kubectl/util/qos"
resourcehelper "k8s.io/kubernetes/pkg/kubectl/util/resource"
"k8s.io/kubernetes/pkg/kubectl/util/slice"
storageutil "k8s.io/kubernetes/pkg/kubectl/util/storage"
)
// Each level has 2 spaces for PrefixWriter

View File

@ -21,7 +21,7 @@ import (
"testing"
"k8s.io/apimachinery/pkg/api/meta/testrestmapper"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func TestSplitAndParseResourceRequest(t *testing.T) {

View File

@ -25,7 +25,7 @@ import (
appsv1beta2 "k8s.io/api/apps/v1beta2"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
// Currently only supports Deployments.

View File

@ -26,7 +26,7 @@ import (
appsv1beta2 "k8s.io/api/apps/v1beta2"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func defaultObjectRestarter(obj runtime.Object) ([]byte, error) {

View File

@ -25,7 +25,7 @@ import (
appsv1beta2 "k8s.io/api/apps/v1beta2"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func defaultObjectResumer(obj runtime.Object) ([]byte, error) {

View File

@ -34,7 +34,7 @@ import (
"k8s.io/client-go/kubernetes"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
kapps "k8s.io/kubernetes/pkg/kubectl/apps"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
const (

View File

@ -40,7 +40,7 @@ import (
restclient "k8s.io/client-go/rest"
manualfake "k8s.io/client-go/rest/fake"
testcore "k8s.io/client-go/testing"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
"k8s.io/kubernetes/pkg/kubectl/util"
)

View File

@ -24,7 +24,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
deploymentutil "k8s.io/kubectl/pkg/util/deployment"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
// StatusViewer provides an interface for resources that have rollout status.

View File

@ -24,7 +24,7 @@ import (
api "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/kubernetes/pkg/kubectl/scheme"
"k8s.io/kubectl/pkg/scheme"
)
func TestDeploymentStatusViewerStatus(t *testing.T) {