diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 79e7b408608..8590b477ff2 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -85,7 +85,6 @@ filegroup( "//pkg/kubectl/apply:all-srcs", "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/describe:all-srcs", - "//pkg/kubectl/drain:all-srcs", "//pkg/kubectl/explain:all-srcs", "//pkg/kubectl/generate:all-srcs", "//pkg/kubectl/generated:all-srcs", diff --git a/pkg/kubectl/cmd/drain/BUILD b/pkg/kubectl/cmd/drain/BUILD index 651ea7c7e18..da900262fdb 100644 --- a/pkg/kubectl/cmd/drain/BUILD +++ b/pkg/kubectl/cmd/drain/BUILD @@ -7,7 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/drain:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -20,6 +19,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_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/drain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", @@ -33,7 +33,6 @@ go_test( deps = [ "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/drain:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", @@ -48,6 +47,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/drain:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", diff --git a/pkg/kubectl/cmd/drain/drain.go b/pkg/kubectl/cmd/drain/drain.go index 8612d2244dc..612022c11b1 100644 --- a/pkg/kubectl/cmd/drain/drain.go +++ b/pkg/kubectl/cmd/drain/drain.go @@ -36,10 +36,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" "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/util/i18n" ) diff --git a/pkg/kubectl/cmd/drain/drain_test.go b/pkg/kubectl/cmd/drain/drain_test.go index 35d845696d4..6366bb80356 100644 --- a/pkg/kubectl/cmd/drain/drain_test.go +++ b/pkg/kubectl/cmd/drain/drain_test.go @@ -47,10 +47,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/rest/fake" + "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/drain" utilpointer "k8s.io/utils/pointer" ) diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index d208f48ddd4..60bd720c7e6 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -10,6 +10,7 @@ filegroup( srcs = [ ":package-srcs", "//staging/src/k8s.io/kubectl/pkg/apps:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/drain: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/pkg/kubectl/drain/BUILD b/staging/src/k8s.io/kubectl/pkg/drain/BUILD similarity index 92% rename from pkg/kubectl/drain/BUILD rename to staging/src/k8s.io/kubectl/pkg/drain/BUILD index aea03e06dcb..685fabd49f8 100644 --- a/pkg/kubectl/drain/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/drain/BUILD @@ -7,7 +7,8 @@ go_library( "drain.go", "filters.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/drain", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/drain", + importpath = "k8s.io/kubectl/pkg/drain", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/apps/v1:go_default_library", diff --git a/pkg/kubectl/drain/cordon.go b/staging/src/k8s.io/kubectl/pkg/drain/cordon.go similarity index 100% rename from pkg/kubectl/drain/cordon.go rename to staging/src/k8s.io/kubectl/pkg/drain/cordon.go diff --git a/pkg/kubectl/drain/drain.go b/staging/src/k8s.io/kubectl/pkg/drain/drain.go similarity index 100% rename from pkg/kubectl/drain/drain.go rename to staging/src/k8s.io/kubectl/pkg/drain/drain.go diff --git a/pkg/kubectl/drain/filters.go b/staging/src/k8s.io/kubectl/pkg/drain/filters.go similarity index 100% rename from pkg/kubectl/drain/filters.go rename to staging/src/k8s.io/kubectl/pkg/drain/filters.go diff --git a/vendor/modules.txt b/vendor/modules.txt index bd86ee2a7fb..0f3633eb6c0 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1642,6 +1642,7 @@ k8s.io/kube-proxy/config/v1alpha1 k8s.io/kube-scheduler/config/v1alpha1 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl k8s.io/kubectl/pkg/apps +k8s.io/kubectl/pkg/drain k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util