From 902789d3752b2bb3eb60d2052083c8605cc6be63 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Sat, 27 Jul 2019 20:58:04 -0700 Subject: [PATCH] Move pkg/kubectl/generate to staging --- hack/.golint_failures | 4 ++-- pkg/kubectl/BUILD | 1 - pkg/kubectl/cmd/autoscale/BUILD | 4 ++-- pkg/kubectl/cmd/autoscale/autoscale.go | 4 ++-- pkg/kubectl/cmd/create/BUILD | 6 +++--- pkg/kubectl/cmd/create/create.go | 2 +- pkg/kubectl/cmd/create/create_clusterrolebinding.go | 4 ++-- pkg/kubectl/cmd/create/create_configmap.go | 4 ++-- pkg/kubectl/cmd/create/create_deployment.go | 4 ++-- pkg/kubectl/cmd/create/create_deployment_test.go | 2 +- pkg/kubectl/cmd/create/create_namespace.go | 4 ++-- pkg/kubectl/cmd/create/create_pdb.go | 4 ++-- pkg/kubectl/cmd/create/create_priorityclass.go | 4 ++-- pkg/kubectl/cmd/create/create_quota.go | 4 ++-- pkg/kubectl/cmd/create/create_rolebinding.go | 4 ++-- pkg/kubectl/cmd/create/create_secret.go | 4 ++-- pkg/kubectl/cmd/create/create_service.go | 4 ++-- pkg/kubectl/cmd/create/create_serviceaccount.go | 4 ++-- pkg/kubectl/cmd/expose/BUILD | 4 ++-- pkg/kubectl/cmd/expose/expose.go | 4 ++-- pkg/kubectl/cmd/run/BUILD | 4 ++-- pkg/kubectl/cmd/run/run.go | 4 ++-- pkg/kubectl/cmd/set/BUILD | 2 +- pkg/kubectl/cmd/set/set_resources.go | 2 +- staging/src/k8s.io/kubectl/BUILD | 1 + .../src/k8s.io/kubectl/pkg}/generate/BUILD | 5 +++-- .../src/k8s.io/kubectl/pkg}/generate/generate.go | 0 .../src/k8s.io/kubectl/pkg}/generate/generate_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/BUILD | 7 ++++--- .../k8s.io/kubectl/pkg}/generate/versioned/autoscale.go | 2 +- .../kubectl/pkg}/generate/versioned/autoscale_test.go | 0 .../kubectl/pkg}/generate/versioned/clusterrolebinding.go | 2 +- .../pkg}/generate/versioned/clusterrolebinding_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/configmap.go | 2 +- .../kubectl/pkg}/generate/versioned/configmap_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/deployment.go | 2 +- .../kubectl/pkg}/generate/versioned/deployment_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/env_file.go | 0 .../kubectl/pkg}/generate/versioned/env_file_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/generator.go | 2 +- .../k8s.io/kubectl/pkg}/generate/versioned/namespace.go | 2 +- .../kubectl/pkg}/generate/versioned/namespace_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/pdb.go | 2 +- .../src/k8s.io/kubectl/pkg}/generate/versioned/pdb_test.go | 0 .../kubectl/pkg}/generate/versioned/priorityclass.go | 2 +- .../kubectl/pkg}/generate/versioned/priorityclass_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/quota.go | 2 +- .../k8s.io/kubectl/pkg}/generate/versioned/quota_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/rolebinding.go | 2 +- .../kubectl/pkg}/generate/versioned/rolebinding_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/run.go | 2 +- .../src/k8s.io/kubectl/pkg}/generate/versioned/run_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/secret.go | 2 +- .../pkg}/generate/versioned/secret_for_docker_registry.go | 2 +- .../generate/versioned/secret_for_docker_registry_test.go | 0 .../kubectl/pkg}/generate/versioned/secret_for_tls.go | 2 +- .../kubectl/pkg}/generate/versioned/secret_for_tls_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/secret_test.go | 0 .../src/k8s.io/kubectl/pkg}/generate/versioned/service.go | 2 +- .../kubectl/pkg}/generate/versioned/service_basic.go | 2 +- .../kubectl/pkg}/generate/versioned/service_basic_test.go | 0 .../k8s.io/kubectl/pkg}/generate/versioned/service_test.go | 2 +- .../kubectl/pkg}/generate/versioned/serviceaccount.go | 2 +- .../kubectl/pkg}/generate/versioned/serviceaccount_test.go | 0 vendor/modules.txt | 2 ++ 65 files changed, 71 insertions(+), 67 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/BUILD (83%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/generate.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/generate_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/BUILD (93%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/autoscale.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/autoscale_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/clusterrolebinding.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/clusterrolebinding_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/configmap.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/configmap_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/deployment.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/deployment_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/env_file.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/env_file_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/generator.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/namespace.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/namespace_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/pdb.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/pdb_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/priorityclass.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/priorityclass_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/quota.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/quota_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/rolebinding.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/rolebinding_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/run.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/run_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret_for_docker_registry.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret_for_docker_registry_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret_for_tls.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret_for_tls_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/secret_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/service.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/service_basic.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/service_basic_test.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/service_test.go (99%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/serviceaccount.go (97%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generate/versioned/serviceaccount_test.go (100%) diff --git a/hack/.golint_failures b/hack/.golint_failures index da6592c0473..6b275e7659b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -138,8 +138,6 @@ pkg/kubectl/cmd/taint pkg/kubectl/cmd/testing pkg/kubectl/cmd/top pkg/kubectl/cmd/wait -pkg/kubectl/generate -pkg/kubectl/generate/versioned pkg/kubelet pkg/kubelet/apis/config pkg/kubelet/apis/config/v1beta1 @@ -534,6 +532,8 @@ staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister 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/generate +staging/src/k8s.io/kubectl/pkg/generate/versioned staging/src/k8s.io/kubectl/pkg/metricsutil staging/src/k8s.io/kubectl/pkg/polymorphichelpers staging/src/k8s.io/kubectl/pkg/util/templates diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 11c5f059dfb..4bac239e5dd 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -84,7 +84,6 @@ filegroup( ":package-srcs", "//pkg/kubectl/cmd:all-srcs", "//pkg/kubectl/explain:all-srcs", - "//pkg/kubectl/generate:all-srcs", "//pkg/kubectl/proxy:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/cmd/autoscale/BUILD b/pkg/kubectl/cmd/autoscale/BUILD index 1c0664f80e9..835baf4801c 100644 --- a/pkg/kubectl/cmd/autoscale/BUILD +++ b/pkg/kubectl/cmd/autoscale/BUILD @@ -6,8 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/autoscale", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/generate:go_default_library", - "//pkg/kubectl/generate/versioned:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -16,6 +14,8 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library", "//staging/src/k8s.io/client-go/scale:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate/versioned: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/autoscale/autoscale.go b/pkg/kubectl/cmd/autoscale/autoscale.go index 9c43b7558d1..9283b733513 100644 --- a/pkg/kubectl/cmd/autoscale/autoscale.go +++ b/pkg/kubectl/cmd/autoscale/autoscale.go @@ -30,12 +30,12 @@ import ( autoscalingv1client "k8s.io/client-go/kubernetes/typed/autoscaling/v1" "k8s.io/client-go/scale" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/BUILD b/pkg/kubectl/cmd/create/BUILD index 05c1a46b019..93f206ce6ed 100644 --- a/pkg/kubectl/cmd/create/BUILD +++ b/pkg/kubectl/cmd/create/BUILD @@ -23,8 +23,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/create", visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"], deps = [ - "//pkg/kubectl/generate:go_default_library", - "//pkg/kubectl/generate/versioned: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/batch/v1beta1:go_default_library", @@ -46,6 +44,8 @@ go_library( "//staging/src/k8s.io/component-base/cli/flag:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util/editor:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/rawhttp:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", @@ -82,7 +82,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/kubectl/cmd/testing:go_default_library", - "//pkg/kubectl/generate/versioned: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/batch/v1beta1:go_default_library", @@ -98,6 +97,7 @@ go_test( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//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/kubectl/pkg/generate/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", ], diff --git a/pkg/kubectl/cmd/create/create.go b/pkg/kubectl/cmd/create/create.go index 497cf11b87f..19c88c9fb1d 100644 --- a/pkg/kubectl/cmd/create/create.go +++ b/pkg/kubectl/cmd/create/create.go @@ -37,12 +37,12 @@ import ( "k8s.io/client-go/dynamic" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/cmd/util/editor" + "k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/rawhttp" "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" ) // CreateOptions is the commandline options for 'create' sub command diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding.go b/pkg/kubectl/cmd/create/create_clusterrolebinding.go index bf04b7bff6f..452bdde7752 100644 --- a/pkg/kubectl/cmd/create/create_clusterrolebinding.go +++ b/pkg/kubectl/cmd/create/create_clusterrolebinding.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_configmap.go b/pkg/kubectl/cmd/create/create_configmap.go index cf5dadd021a..dde0a89c962 100644 --- a/pkg/kubectl/cmd/create/create_configmap.go +++ b/pkg/kubectl/cmd/create/create_configmap.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_deployment.go b/pkg/kubectl/cmd/create/create_deployment.go index 3299597e42a..0fb36a6eaec 100644 --- a/pkg/kubectl/cmd/create/create_deployment.go +++ b/pkg/kubectl/cmd/create/create_deployment.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_deployment_test.go b/pkg/kubectl/cmd/create/create_deployment_test.go index e2fd21742e3..7f70184ebb7 100644 --- a/pkg/kubectl/cmd/create/create_deployment_test.go +++ b/pkg/kubectl/cmd/create/create_deployment_test.go @@ -27,9 +27,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "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" - generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" ) func Test_generatorFromName(t *testing.T) { diff --git a/pkg/kubectl/cmd/create/create_namespace.go b/pkg/kubectl/cmd/create/create_namespace.go index 1676c4d3499..00f58aa0bd7 100644 --- a/pkg/kubectl/cmd/create/create_namespace.go +++ b/pkg/kubectl/cmd/create/create_namespace.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_pdb.go b/pkg/kubectl/cmd/create/create_pdb.go index 2dd67d75c8a..fd321bff8af 100644 --- a/pkg/kubectl/cmd/create/create_pdb.go +++ b/pkg/kubectl/cmd/create/create_pdb.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_priorityclass.go b/pkg/kubectl/cmd/create/create_priorityclass.go index 6830a2b4b99..c50d343df76 100644 --- a/pkg/kubectl/cmd/create/create_priorityclass.go +++ b/pkg/kubectl/cmd/create/create_priorityclass.go @@ -22,10 +22,10 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_quota.go b/pkg/kubectl/cmd/create/create_quota.go index 26912656e74..586d1be856e 100644 --- a/pkg/kubectl/cmd/create/create_quota.go +++ b/pkg/kubectl/cmd/create/create_quota.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_rolebinding.go b/pkg/kubectl/cmd/create/create_rolebinding.go index 8fafe778109..cae2b2c8100 100644 --- a/pkg/kubectl/cmd/create/create_rolebinding.go +++ b/pkg/kubectl/cmd/create/create_rolebinding.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/create/create_secret.go b/pkg/kubectl/cmd/create/create_secret.go index 6314d0c5f3d..102a6310c01 100644 --- a/pkg/kubectl/cmd/create/create_secret.go +++ b/pkg/kubectl/cmd/create/create_secret.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) // NewCmdCreateSecret groups subcommands to create various types of secrets diff --git a/pkg/kubectl/cmd/create/create_service.go b/pkg/kubectl/cmd/create/create_service.go index 33ac2557e55..c1267e00ee4 100644 --- a/pkg/kubectl/cmd/create/create_service.go +++ b/pkg/kubectl/cmd/create/create_service.go @@ -22,10 +22,10 @@ import ( "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) // NewCmdCreateService is a macro command to create a new service diff --git a/pkg/kubectl/cmd/create/create_serviceaccount.go b/pkg/kubectl/cmd/create/create_serviceaccount.go index 18120e29b13..7dd2746a188 100644 --- a/pkg/kubectl/cmd/create/create_serviceaccount.go +++ b/pkg/kubectl/cmd/create/create_serviceaccount.go @@ -21,10 +21,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" cmdutil "k8s.io/kubectl/pkg/cmd/util" + "k8s.io/kubectl/pkg/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/expose/BUILD b/pkg/kubectl/cmd/expose/BUILD index 7180d64dc1f..2bf667ce314 100644 --- a/pkg/kubectl/cmd/expose/BUILD +++ b/pkg/kubectl/cmd/expose/BUILD @@ -6,8 +6,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/expose", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/generate:go_default_library", - "//pkg/kubectl/generate/versioned: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", @@ -19,6 +17,8 @@ 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/generate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate/versioned: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", diff --git a/pkg/kubectl/cmd/expose/expose.go b/pkg/kubectl/cmd/expose/expose.go index 41a689f003e..bf010ded33f 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/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/pkg/kubectl/cmd/run/BUILD b/pkg/kubectl/cmd/run/BUILD index cf84895c91b..e27599f0056 100644 --- a/pkg/kubectl/cmd/run/BUILD +++ b/pkg/kubectl/cmd/run/BUILD @@ -11,8 +11,6 @@ go_library( "//pkg/kubectl/cmd/delete:go_default_library", "//pkg/kubectl/cmd/exec:go_default_library", "//pkg/kubectl/cmd/logs:go_default_library", - "//pkg/kubectl/generate:go_default_library", - "//pkg/kubectl/generate/versioned: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", @@ -29,6 +27,8 @@ 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/generate:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate/versioned: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", diff --git a/pkg/kubectl/cmd/run/run.go b/pkg/kubectl/cmd/run/run.go index ecf97f0e9b5..49b683f0f3e 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -41,6 +41,8 @@ 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/generate" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "k8s.io/kubectl/pkg/polymorphichelpers" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" @@ -52,8 +54,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubernetes/pkg/kubectl/cmd/logs" - "k8s.io/kubernetes/pkg/kubectl/generate" - generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" uexec "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index c4015db06fe..a3dfe6ac9db 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -20,7 +20,6 @@ go_library( visibility = ["//build/visible_to:pkg_kubectl_cmd_set_CONSUMERS"], deps = [ "//pkg/kubectl/cmd/set/env:go_default_library", - "//pkg/kubectl/generate/versioned: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", @@ -36,6 +35,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/generate/versioned: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", diff --git a/pkg/kubectl/cmd/set/set_resources.go b/pkg/kubectl/cmd/set/set_resources.go index 4fbe20aecde..87c5bc9fb89 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" + generateversioned "k8s.io/kubectl/pkg/generate/versioned" "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" ) var ( diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index a55ebc594c7..f2c4e18b76e 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -14,6 +14,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/cmd/util:all-srcs", "//staging/src/k8s.io/kubectl/pkg/describe:all-srcs", "//staging/src/k8s.io/kubectl/pkg/drain:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/generate: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", diff --git a/pkg/kubectl/generate/BUILD b/staging/src/k8s.io/kubectl/pkg/generate/BUILD similarity index 83% rename from pkg/kubectl/generate/BUILD rename to staging/src/k8s.io/kubectl/pkg/generate/BUILD index ac22efa5218..d163f7a94f2 100644 --- a/pkg/kubectl/generate/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/generate/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["generate.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/generate", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/generate", + importpath = "k8s.io/kubectl/pkg/generate", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -31,7 +32,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", - "//pkg/kubectl/generate/versioned:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/generate/versioned:all-srcs", ], tags = ["automanaged"], visibility = ["//visibility:public"], diff --git a/pkg/kubectl/generate/generate.go b/staging/src/k8s.io/kubectl/pkg/generate/generate.go similarity index 100% rename from pkg/kubectl/generate/generate.go rename to staging/src/k8s.io/kubectl/pkg/generate/generate.go diff --git a/pkg/kubectl/generate/generate_test.go b/staging/src/k8s.io/kubectl/pkg/generate/generate_test.go similarity index 100% rename from pkg/kubectl/generate/generate_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/generate_test.go diff --git a/pkg/kubectl/generate/versioned/BUILD b/staging/src/k8s.io/kubectl/pkg/generate/versioned/BUILD similarity index 93% rename from pkg/kubectl/generate/versioned/BUILD rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/BUILD index ec417acb519..ee7c3d04a0b 100644 --- a/pkg/kubectl/generate/versioned/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/BUILD @@ -22,10 +22,10 @@ go_library( "service_basic.go", "serviceaccount.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/generate/versioned", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/generate/versioned", + importpath = "k8s.io/kubectl/pkg/generate/versioned", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/generate:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -47,6 +47,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/validation:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/hash:go_default_library", ], @@ -75,7 +76,6 @@ go_test( ], embed = [":go_default_library"], deps = [ - "//pkg/kubectl/generate:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1beta1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", @@ -92,6 +92,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generate:go_default_library", "//vendor/k8s.io/utils/pointer:go_default_library", ], ) diff --git a/pkg/kubectl/generate/versioned/autoscale.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/autoscale.go similarity index 98% rename from pkg/kubectl/generate/versioned/autoscale.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/autoscale.go index 7cb8dbbc50d..5d1669a0d93 100644 --- a/pkg/kubectl/generate/versioned/autoscale.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/autoscale.go @@ -22,7 +22,7 @@ import ( autoscalingv1 "k8s.io/api/autoscaling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // HorizontalPodAutoscalerGeneratorV1 supports stable generation of a horizontal pod autoscaler. diff --git a/pkg/kubectl/generate/versioned/autoscale_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/autoscale_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/autoscale_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/autoscale_test.go diff --git a/pkg/kubectl/generate/versioned/clusterrolebinding.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/clusterrolebinding.go similarity index 99% rename from pkg/kubectl/generate/versioned/clusterrolebinding.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/clusterrolebinding.go index b874c63794b..c77c2dbf24e 100644 --- a/pkg/kubectl/generate/versioned/clusterrolebinding.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/clusterrolebinding.go @@ -24,7 +24,7 @@ import ( rbacv1beta1 "k8s.io/api/rbac/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // ClusterRoleBindingGeneratorV1 supports stable generation of a clusterRoleBinding. diff --git a/pkg/kubectl/generate/versioned/clusterrolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/clusterrolebinding_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/clusterrolebinding_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/clusterrolebinding_test.go diff --git a/pkg/kubectl/generate/versioned/configmap.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/configmap.go similarity index 99% rename from pkg/kubectl/generate/versioned/configmap.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/configmap.go index 94fa1138e00..52a5ebe3e1d 100644 --- a/pkg/kubectl/generate/versioned/configmap.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/configmap.go @@ -27,9 +27,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/hash" - "k8s.io/kubernetes/pkg/kubectl/generate" ) // ConfigMapGeneratorV1 supports stable generation of a configMap. diff --git a/pkg/kubectl/generate/versioned/configmap_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/configmap_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/configmap_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/configmap_test.go diff --git a/pkg/kubectl/generate/versioned/deployment.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/deployment.go similarity index 99% rename from pkg/kubectl/generate/versioned/deployment.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/deployment.go index 4b2b24d575d..9878f2cd8f5 100644 --- a/pkg/kubectl/generate/versioned/deployment.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/deployment.go @@ -26,7 +26,7 @@ import ( extensionsv1beta1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // BaseDeploymentGenerator implements the common functionality of diff --git a/pkg/kubectl/generate/versioned/deployment_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/deployment_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/deployment_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/deployment_test.go diff --git a/pkg/kubectl/generate/versioned/env_file.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/env_file.go similarity index 100% rename from pkg/kubectl/generate/versioned/env_file.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/env_file.go diff --git a/pkg/kubectl/generate/versioned/env_file_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/env_file_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/env_file_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/env_file_test.go diff --git a/pkg/kubectl/generate/versioned/generator.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/generator.go similarity index 99% rename from pkg/kubectl/generate/versioned/generator.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/generator.go index f0a6d6aba16..9d434a506b2 100644 --- a/pkg/kubectl/generate/versioned/generator.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/generator.go @@ -29,7 +29,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/discovery" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // GeneratorFn gives a way to easily override the function for unit testing if needed diff --git a/pkg/kubectl/generate/versioned/namespace.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/namespace.go similarity index 98% rename from pkg/kubectl/generate/versioned/namespace.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/namespace.go index 8921764db62..23cdbfa5aeb 100644 --- a/pkg/kubectl/generate/versioned/namespace.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/namespace.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // NamespaceGeneratorV1 supports stable generation of a namespace diff --git a/pkg/kubectl/generate/versioned/namespace_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/namespace_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/namespace_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/namespace_test.go diff --git a/pkg/kubectl/generate/versioned/pdb.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/pdb.go similarity index 99% rename from pkg/kubectl/generate/versioned/pdb.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/pdb.go index a8cc6469e11..a28fcefcc10 100644 --- a/pkg/kubectl/generate/versioned/pdb.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/pdb.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // PodDisruptionBudgetV1Generator supports stable generation of a pod disruption budget. diff --git a/pkg/kubectl/generate/versioned/pdb_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/pdb_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/pdb_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/pdb_test.go diff --git a/pkg/kubectl/generate/versioned/priorityclass.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/priorityclass.go similarity index 98% rename from pkg/kubectl/generate/versioned/priorityclass.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/priorityclass.go index a141d219660..a819ece3d4c 100644 --- a/pkg/kubectl/generate/versioned/priorityclass.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/priorityclass.go @@ -23,7 +23,7 @@ import ( scheduling "k8s.io/api/scheduling/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // PriorityClassV1Generator supports stable generation of a priorityClass. diff --git a/pkg/kubectl/generate/versioned/priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/priorityclass_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/priorityclass_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/priorityclass_test.go diff --git a/pkg/kubectl/generate/versioned/quota.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/quota.go similarity index 98% rename from pkg/kubectl/generate/versioned/quota.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/quota.go index c3710acb3b4..1a59b6e37df 100644 --- a/pkg/kubectl/generate/versioned/quota.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/quota.go @@ -22,7 +22,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // ResourceQuotaGeneratorV1 supports stable generation of a resource quota diff --git a/pkg/kubectl/generate/versioned/quota_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/quota_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/quota_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/quota_test.go diff --git a/pkg/kubectl/generate/versioned/rolebinding.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/rolebinding.go similarity index 99% rename from pkg/kubectl/generate/versioned/rolebinding.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/rolebinding.go index ed91208855b..f811750c91f 100644 --- a/pkg/kubectl/generate/versioned/rolebinding.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/rolebinding.go @@ -24,7 +24,7 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // RoleBindingGeneratorV1 supports stable generation of a roleBinding. diff --git a/pkg/kubectl/generate/versioned/rolebinding_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/rolebinding_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/rolebinding_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/rolebinding_test.go diff --git a/pkg/kubectl/generate/versioned/run.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/run.go similarity index 99% rename from pkg/kubectl/generate/versioned/run.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/run.go index 4557aef7779..156ecf1b31a 100644 --- a/pkg/kubectl/generate/versioned/run.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/run.go @@ -32,7 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) type DeploymentV1Beta1 struct{} diff --git a/pkg/kubectl/generate/versioned/run_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/run_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/run_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/run_test.go diff --git a/pkg/kubectl/generate/versioned/secret.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret.go similarity index 99% rename from pkg/kubectl/generate/versioned/secret.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret.go index 8a9632c66a3..9acaecf337e 100644 --- a/pkg/kubectl/generate/versioned/secret.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret.go @@ -26,9 +26,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/validation" + "k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/util" "k8s.io/kubectl/pkg/util/hash" - "k8s.io/kubernetes/pkg/kubectl/generate" ) // SecretGeneratorV1 supports stable generation of an opaque secret diff --git a/pkg/kubectl/generate/versioned/secret_for_docker_registry.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go similarity index 99% rename from pkg/kubectl/generate/versioned/secret_for_docker_registry.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go index cea22339910..afbe2d3d84e 100644 --- a/pkg/kubectl/generate/versioned/secret_for_docker_registry.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/util/hash" - "k8s.io/kubernetes/pkg/kubectl/generate" ) // SecretForDockerRegistryGeneratorV1 supports stable generation of a docker registry secret diff --git a/pkg/kubectl/generate/versioned/secret_for_docker_registry_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/secret_for_docker_registry_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry_test.go diff --git a/pkg/kubectl/generate/versioned/secret_for_tls.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_tls.go similarity index 99% rename from pkg/kubectl/generate/versioned/secret_for_tls.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_tls.go index 7e7718d3273..7c65f0b41c9 100644 --- a/pkg/kubectl/generate/versioned/secret_for_tls.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_tls.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/kubectl/pkg/generate" "k8s.io/kubectl/pkg/util/hash" - "k8s.io/kubernetes/pkg/kubectl/generate" ) // SecretForTLSGeneratorV1 supports stable generation of a TLS secret. diff --git a/pkg/kubectl/generate/versioned/secret_for_tls_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_tls_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/secret_for_tls_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_tls_test.go diff --git a/pkg/kubectl/generate/versioned/secret_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/secret_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_test.go diff --git a/pkg/kubectl/generate/versioned/service.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service.go similarity index 99% rename from pkg/kubectl/generate/versioned/service.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/service.go index 39d084bf9ff..30f37915681 100644 --- a/pkg/kubectl/generate/versioned/service.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // The only difference between ServiceGeneratorV1 and V2 is that the service port is named "default" in V1, while it is left unnamed in V2. diff --git a/pkg/kubectl/generate/versioned/service_basic.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service_basic.go similarity index 99% rename from pkg/kubectl/generate/versioned/service_basic.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/service_basic.go index be1e6667f35..f366c3ed647 100644 --- a/pkg/kubectl/generate/versioned/service_basic.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service_basic.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/validation" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) type ServiceCommonGeneratorV1 struct { diff --git a/pkg/kubectl/generate/versioned/service_basic_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service_basic_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/service_basic_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/service_basic_test.go diff --git a/pkg/kubectl/generate/versioned/service_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service_test.go similarity index 99% rename from pkg/kubectl/generate/versioned/service_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/service_test.go index bf198516008..9285ea522e2 100644 --- a/pkg/kubectl/generate/versioned/service_test.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/service_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) func TestGenerateService(t *testing.T) { diff --git a/pkg/kubectl/generate/versioned/serviceaccount.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/serviceaccount.go similarity index 97% rename from pkg/kubectl/generate/versioned/serviceaccount.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/serviceaccount.go index e69b88de184..659d151580d 100644 --- a/pkg/kubectl/generate/versioned/serviceaccount.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/serviceaccount.go @@ -21,7 +21,7 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/kubernetes/pkg/kubectl/generate" + "k8s.io/kubectl/pkg/generate" ) // ServiceAccountGeneratorV1 supports stable generation of a service account diff --git a/pkg/kubectl/generate/versioned/serviceaccount_test.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/serviceaccount_test.go similarity index 100% rename from pkg/kubectl/generate/versioned/serviceaccount_test.go rename to staging/src/k8s.io/kubectl/pkg/generate/versioned/serviceaccount_test.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 562b40c0dc6..2a86bbb316b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1649,6 +1649,8 @@ k8s.io/kubectl/pkg/cmd/util/sanity k8s.io/kubectl/pkg/describe k8s.io/kubectl/pkg/describe/versioned k8s.io/kubectl/pkg/drain +k8s.io/kubectl/pkg/generate +k8s.io/kubectl/pkg/generate/versioned k8s.io/kubectl/pkg/generated k8s.io/kubectl/pkg/metricsutil k8s.io/kubectl/pkg/polymorphichelpers