diff --git a/hack/.golint_failures b/hack/.golint_failures index 9f51903196f..da6592c0473 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -140,7 +140,6 @@ pkg/kubectl/cmd/top pkg/kubectl/cmd/wait pkg/kubectl/generate pkg/kubectl/generate/versioned -pkg/kubectl/polymorphichelpers pkg/kubelet pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 @@ -536,6 +535,7 @@ staging/src/k8s.io/kube-proxy/config/v1alpha1 staging/src/k8s.io/kubectl/pkg/cmd/util staging/src/k8s.io/kubectl/pkg/describe/versioned staging/src/k8s.io/kubectl/pkg/metricsutil +staging/src/k8s.io/kubectl/pkg/polymorphichelpers staging/src/k8s.io/kubectl/pkg/util/templates staging/src/k8s.io/kubelet/config/v1beta1 staging/src/k8s.io/legacy-cloud-providers/vsphere diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 8819f1790e2..11c5f059dfb 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -85,7 +85,6 @@ filegroup( "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/explain:all-srcs", "//pkg/kubectl/generate:all-srcs", - "//pkg/kubectl/polymorphichelpers:all-srcs", "//pkg/kubectl/proxy:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/annotate/BUILD b/pkg/kubectl/cmd/annotate/BUILD index bb171316624..09c1da8aa86 100644 --- a/pkg/kubectl/cmd/annotate/BUILD +++ b/pkg/kubectl/cmd/annotate/BUILD @@ -6,7 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/annotate", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -16,6 +15,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/annotate/annotate.go b/pkg/kubectl/cmd/annotate/annotate.go index a48f79ce695..d647f3c604b 100644 --- a/pkg/kubectl/cmd/annotate/annotate.go +++ b/pkg/kubectl/cmd/annotate/annotate.go @@ -35,10 +35,10 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) // AnnotateOptions have the data required to perform the annotate operation diff --git a/pkg/kubectl/cmd/attach/BUILD b/pkg/kubectl/cmd/attach/BUILD index 0c09150ed8a..e91ad66356a 100644 --- a/pkg/kubectl/cmd/attach/BUILD +++ b/pkg/kubectl/cmd/attach/BUILD @@ -7,7 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -15,6 +14,7 @@ go_library( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", @@ -30,7 +30,6 @@ go_test( deps = [ "//pkg/kubectl/cmd/exec:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -39,6 +38,7 @@ go_test( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/attach/attach.go b/pkg/kubectl/cmd/attach/attach.go index 8f5058e728f..0b79170dd85 100644 --- a/pkg/kubectl/cmd/attach/attach.go +++ b/pkg/kubectl/cmd/attach/attach.go @@ -32,11 +32,11 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "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/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/attach/attach_test.go b/pkg/kubectl/cmd/attach/attach_test.go index 2b840ff1344..1c28a540c62 100644 --- a/pkg/kubectl/cmd/attach/attach_test.go +++ b/pkg/kubectl/cmd/attach/attach_test.go @@ -33,10 +33,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "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/kubernetes/pkg/kubectl/polymorphichelpers" ) type fakeRemoteAttach struct { diff --git a/pkg/kubectl/cmd/clusterinfo/BUILD b/pkg/kubectl/cmd/clusterinfo/BUILD index ee301eda86b..4aa0093ad36 100644 --- a/pkg/kubectl/cmd/clusterinfo/BUILD +++ b/pkg/kubectl/cmd/clusterinfo/BUILD @@ -9,7 +9,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", @@ -20,6 +19,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go index 6051a84b362..4c0e2822050 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go @@ -32,10 +32,10 @@ import ( appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) const ( diff --git a/pkg/kubectl/cmd/exec/BUILD b/pkg/kubectl/cmd/exec/BUILD index b11eac19f44..c16cb12859a 100644 --- a/pkg/kubectl/cmd/exec/BUILD +++ b/pkg/kubectl/cmd/exec/BUILD @@ -6,7 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/exec", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -15,6 +14,7 @@ go_library( "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/tools/remotecommand:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", diff --git a/pkg/kubectl/cmd/exec/exec.go b/pkg/kubectl/cmd/exec/exec.go index 270428657e6..b70e3ea64f2 100644 --- a/pkg/kubectl/cmd/exec/exec.go +++ b/pkg/kubectl/cmd/exec/exec.go @@ -33,12 +33,12 @@ import ( "k8s.io/client-go/tools/remotecommand" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/util/term" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/expose/BUILD b/pkg/kubectl/cmd/expose/BUILD index 75516dda457..7180d64dc1f 100644 --- a/pkg/kubectl/cmd/expose/BUILD +++ b/pkg/kubectl/cmd/expose/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", @@ -20,6 +19,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/pkg/kubectl/cmd/expose/expose.go b/pkg/kubectl/cmd/expose/expose.go index f39b42fb2d3..41a689f003e 100644 --- a/pkg/kubectl/cmd/expose/expose.go +++ b/pkg/kubectl/cmd/expose/expose.go @@ -34,13 +34,13 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/dynamic" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/logs/BUILD b/pkg/kubectl/cmd/logs/BUILD index 980b20f5f5e..afbc39176bc 100644 --- a/pkg/kubectl/cmd/logs/BUILD +++ b/pkg/kubectl/cmd/logs/BUILD @@ -6,13 +6,13 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/logs", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index b419f9beeb9..3c0e5137ea3 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -33,11 +33,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) const ( diff --git a/pkg/kubectl/cmd/portforward/BUILD b/pkg/kubectl/cmd/portforward/BUILD index b763fa828e5..a34affa3534 100644 --- a/pkg/kubectl/cmd/portforward/BUILD +++ b/pkg/kubectl/cmd/portforward/BUILD @@ -6,7 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/portforward", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -16,6 +15,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/portforward:go_default_library", "//staging/src/k8s.io/client-go/transport/spdy:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/portforward/portforward.go b/pkg/kubectl/cmd/portforward/portforward.go index 83c5294ebe7..dc900f611f6 100644 --- a/pkg/kubectl/cmd/portforward/portforward.go +++ b/pkg/kubectl/cmd/portforward/portforward.go @@ -37,10 +37,10 @@ import ( "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) // PortForwardOptions contains all the options for running the port-forward cli command. diff --git a/pkg/kubectl/cmd/rollout/BUILD b/pkg/kubectl/cmd/rollout/BUILD index b340fd2b65c..fd7c4c4a76c 100644 --- a/pkg/kubectl/cmd/rollout/BUILD +++ b/pkg/kubectl/cmd/rollout/BUILD @@ -21,7 +21,6 @@ go_library( ], deps = [ "//pkg/kubectl/cmd/set:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -38,6 +37,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index 6a81c62242b..d82c94fbf87 100644 --- a/pkg/kubectl/cmd/rollout/rollout_history.go +++ b/pkg/kubectl/cmd/rollout/rollout_history.go @@ -25,10 +25,10 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index 85e54b52a96..61ba901cc14 100644 --- a/pkg/kubectl/cmd/rollout/rollout_pause.go +++ b/pkg/kubectl/cmd/rollout/rollout_pause.go @@ -27,11 +27,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "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/kubernetes/pkg/kubectl/polymorphichelpers" ) // PauseOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/pkg/kubectl/cmd/rollout/rollout_restart.go b/pkg/kubectl/cmd/rollout/rollout_restart.go index 5d9466013de..7d60f2165c6 100644 --- a/pkg/kubectl/cmd/rollout/rollout_restart.go +++ b/pkg/kubectl/cmd/rollout/rollout_restart.go @@ -26,11 +26,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "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/kubernetes/pkg/kubectl/polymorphichelpers" ) // RestartOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/pkg/kubectl/cmd/rollout/rollout_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index 91549b8b179..eb96500d54f 100644 --- a/pkg/kubectl/cmd/rollout/rollout_resume.go +++ b/pkg/kubectl/cmd/rollout/rollout_resume.go @@ -27,11 +27,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "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/kubernetes/pkg/kubectl/polymorphichelpers" ) // ResumeOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/pkg/kubectl/cmd/rollout/rollout_status.go b/pkg/kubectl/cmd/rollout/rollout_status.go index 2d5c86a233a..a44aea40b10 100644 --- a/pkg/kubectl/cmd/rollout/rollout_status.go +++ b/pkg/kubectl/cmd/rollout/rollout_status.go @@ -36,11 +36,11 @@ import ( "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index 3de54499c00..8631a999cbc 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" diff --git a/pkg/kubectl/cmd/run/BUILD b/pkg/kubectl/cmd/run/BUILD index d62640e2dac..cf84895c91b 100644 --- a/pkg/kubectl/cmd/run/BUILD +++ b/pkg/kubectl/cmd/run/BUILD @@ -13,7 +13,6 @@ go_library( "//pkg/kubectl/cmd/logs:go_default_library", "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/client-go/tools/watch:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", diff --git a/pkg/kubectl/cmd/run/run.go b/pkg/kubectl/cmd/run/run.go index 168de7f9b4f..ecf97f0e9b5 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -41,6 +41,7 @@ import ( "k8s.io/client-go/tools/cache" watchtools "k8s.io/client-go/tools/watch" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/i18n" @@ -53,7 +54,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/logs" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" uexec "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index b92d8017784..c4015db06fe 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -21,7 +21,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/set/env:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -37,6 +36,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/set/set_env.go b/pkg/kubectl/cmd/set/set_env.go index e3132f8bdb7..ad18f20afc7 100644 --- a/pkg/kubectl/cmd/set/set_env.go +++ b/pkg/kubectl/cmd/set/set_env.go @@ -35,10 +35,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "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" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index 29595f37caa..f69bbf0284c 100644 --- a/pkg/kubectl/cmd/set/set_image.go +++ b/pkg/kubectl/cmd/set/set_image.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) // ImageOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of diff --git a/pkg/kubectl/cmd/set/set_resources.go b/pkg/kubectl/cmd/set/set_resources.go index 0b0f3179c29..4fbe20aecde 100644 --- a/pkg/kubectl/cmd/set/set_resources.go +++ b/pkg/kubectl/cmd/set/set_resources.go @@ -30,11 +30,11 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/pkg/kubectl/cmd/set/set_serviceaccount.go b/pkg/kubectl/cmd/set/set_serviceaccount.go index f3b0b0c48bc..0c3b6a5e7be 100644 --- a/pkg/kubectl/cmd/set/set_serviceaccount.go +++ b/pkg/kubectl/cmd/set/set_serviceaccount.go @@ -31,10 +31,10 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" ) var ( diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 5fee865cc0d..a55ebc594c7 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -16,6 +16,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/drain:all-srcs", "//staging/src/k8s.io/kubectl/pkg/generated:all-srcs", "//staging/src/k8s.io/kubectl/pkg/metricsutil:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:all-srcs", "//staging/src/k8s.io/kubectl/pkg/rawhttp:all-srcs", "//staging/src/k8s.io/kubectl/pkg/scheme:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util:all-srcs", diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index 8b1fd028960..e5e6a80cb85 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -59,6 +59,7 @@ github.com/go-openapi/swag v0.19.2 h1:jvO6bCMBEilGwMfHhrd61zIID4oIFdwb76V17SM88d github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/gogo/protobuf v0.0.0-20190410021324-65acae22fc9 h1:Kt4R9nQn1c+x/o63vCZuxo3WjBc8EnSfnguI4ELkdoo= github.com/gogo/protobuf v0.0.0-20190410021324-65acae22fc9/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903 h1:LbsanbbD6LieFkXbj9YNNBupiGHJgFeLpO0j0Fza1h8= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= @@ -77,6 +78,7 @@ github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsC github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7 h1:6TSoaYExHper8PYsJu23GWVNOyYRCSnIFyxKgLSZ54w= github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= diff --git a/pkg/kubectl/polymorphichelpers/BUILD b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/BUILD similarity index 97% rename from pkg/kubectl/polymorphichelpers/BUILD rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/BUILD index 22cb32b41d8..028bba601a9 100644 --- a/pkg/kubectl/polymorphichelpers/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/BUILD @@ -22,7 +22,8 @@ go_library( "statusviewer.go", "updatepodspec.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/polymorphichelpers", + importpath = "k8s.io/kubectl/pkg/polymorphichelpers", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/pkg/kubectl/polymorphichelpers/attachablepodforobject.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/attachablepodforobject.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/attachablepodforobject.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/attachablepodforobject.go diff --git a/pkg/kubectl/polymorphichelpers/canbeexposed.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/canbeexposed.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/canbeexposed.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/canbeexposed.go diff --git a/pkg/kubectl/polymorphichelpers/canbeexposed_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/canbeexposed_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/canbeexposed_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/canbeexposed_test.go diff --git a/pkg/kubectl/polymorphichelpers/helpers.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/helpers.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers.go diff --git a/pkg/kubectl/polymorphichelpers/helpers_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/helpers_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/helpers_test.go diff --git a/pkg/kubectl/polymorphichelpers/history.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/history.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/history.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/history.go diff --git a/pkg/kubectl/polymorphichelpers/history_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/history_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/history_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/history_test.go diff --git a/pkg/kubectl/polymorphichelpers/historyviewer.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/historyviewer.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/historyviewer.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/historyviewer.go diff --git a/pkg/kubectl/polymorphichelpers/interface.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/interface.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/interface.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/interface.go diff --git a/pkg/kubectl/polymorphichelpers/logsforobject.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/logsforobject.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject.go diff --git a/pkg/kubectl/polymorphichelpers/logsforobject_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/logsforobject_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/logsforobject_test.go diff --git a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/mapbasedselectorforobject.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/mapbasedselectorforobject.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/mapbasedselectorforobject.go diff --git a/pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/mapbasedselectorforobject_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/mapbasedselectorforobject_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/mapbasedselectorforobject_test.go diff --git a/pkg/kubectl/polymorphichelpers/objectpauser.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectpauser.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/objectpauser.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectpauser.go diff --git a/pkg/kubectl/polymorphichelpers/objectpauser_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectpauser_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/objectpauser_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectpauser_test.go diff --git a/pkg/kubectl/polymorphichelpers/objectrestarter.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectrestarter.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/objectrestarter.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectrestarter.go diff --git a/pkg/kubectl/polymorphichelpers/objectresumer.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectresumer.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/objectresumer.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectresumer.go diff --git a/pkg/kubectl/polymorphichelpers/objectresumer_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectresumer_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/objectresumer_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/objectresumer_test.go diff --git a/pkg/kubectl/polymorphichelpers/portsforobject.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/portsforobject.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/portsforobject.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/portsforobject.go diff --git a/pkg/kubectl/polymorphichelpers/portsforobject_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/portsforobject_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/portsforobject_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/portsforobject_test.go diff --git a/pkg/kubectl/polymorphichelpers/protocolsforobject.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/protocolsforobject.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/protocolsforobject.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/protocolsforobject.go diff --git a/pkg/kubectl/polymorphichelpers/protocolsforobject_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/protocolsforobject_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/protocolsforobject_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/protocolsforobject_test.go diff --git a/pkg/kubectl/polymorphichelpers/rollback.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/rollback.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback.go diff --git a/pkg/kubectl/polymorphichelpers/rollback_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/rollback_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollback_test.go diff --git a/pkg/kubectl/polymorphichelpers/rollbacker.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollbacker.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/rollbacker.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollbacker.go diff --git a/pkg/kubectl/polymorphichelpers/rollout_status.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollout_status.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/rollout_status.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollout_status.go diff --git a/pkg/kubectl/polymorphichelpers/rollout_status_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollout_status_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/rollout_status_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/rollout_status_test.go diff --git a/pkg/kubectl/polymorphichelpers/statusviewer.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/statusviewer.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/statusviewer.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/statusviewer.go diff --git a/pkg/kubectl/polymorphichelpers/updatepodspec.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/updatepodspec.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/updatepodspec.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/updatepodspec.go diff --git a/pkg/kubectl/polymorphichelpers/updatepodspec_test.go b/staging/src/k8s.io/kubectl/pkg/polymorphichelpers/updatepodspec_test.go similarity index 100% rename from pkg/kubectl/polymorphichelpers/updatepodspec_test.go rename to staging/src/k8s.io/kubectl/pkg/polymorphichelpers/updatepodspec_test.go diff --git a/test/e2e/kubectl/BUILD b/test/e2e/kubectl/BUILD index 0072fe58722..fce3c520b4e 100644 --- a/test/e2e/kubectl/BUILD +++ b/test/e2e/kubectl/BUILD @@ -15,7 +15,6 @@ go_library( importpath = "k8s.io/kubernetes/test/e2e/kubectl", deps = [ "//pkg/controller:go_default_library", - "//pkg/kubectl/polymorphichelpers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", "//staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library", @@ -30,6 +29,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library", "//staging/src/k8s.io/apiserver/pkg/registry/generic/registry:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/polymorphichelpers:go_default_library", "//test/e2e/common:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/auth:go_default_library", diff --git a/test/e2e/kubectl/kubectl.go b/test/e2e/kubectl/kubectl.go index 3db239d714a..5ff2315078b 100644 --- a/test/e2e/kubectl/kubectl.go +++ b/test/e2e/kubectl/kubectl.go @@ -75,7 +75,7 @@ import ( "github.com/onsi/ginkgo" "github.com/onsi/gomega" - "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" + "k8s.io/kubectl/pkg/polymorphichelpers" imageutils "k8s.io/kubernetes/test/utils/image" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index e78ee3b8015..562b40c0dc6 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1651,6 +1651,7 @@ k8s.io/kubectl/pkg/describe/versioned k8s.io/kubectl/pkg/drain k8s.io/kubectl/pkg/generated k8s.io/kubectl/pkg/metricsutil +k8s.io/kubectl/pkg/polymorphichelpers k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util