From 70984d83858eef3c9c7d046f84d45c53aead673a Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 25 Jul 2019 14:44:06 -0700 Subject: [PATCH] Moves pkg/kubectl/util/i18n to staging --- go.mod | 1 - hack/boilerplate/boilerplate.py | 2 +- hack/generate-bindata.sh | 2 +- pkg/kubectl/BUILD | 1 - pkg/kubectl/cmd/BUILD | 2 +- pkg/kubectl/cmd/alpha.go | 2 +- pkg/kubectl/cmd/annotate/BUILD | 2 +- pkg/kubectl/cmd/annotate/annotate.go | 2 +- pkg/kubectl/cmd/apiresources/BUILD | 2 +- pkg/kubectl/cmd/apiresources/apiversions.go | 2 +- pkg/kubectl/cmd/apply/BUILD | 2 +- pkg/kubectl/cmd/apply/apply.go | 2 +- pkg/kubectl/cmd/apply/apply_set_last_applied.go | 2 +- pkg/kubectl/cmd/apply/apply_view_last_applied.go | 2 +- pkg/kubectl/cmd/attach/BUILD | 2 +- pkg/kubectl/cmd/attach/attach.go | 2 +- pkg/kubectl/cmd/autoscale/BUILD | 2 +- pkg/kubectl/cmd/autoscale/autoscale.go | 2 +- pkg/kubectl/cmd/certificates/BUILD | 2 +- pkg/kubectl/cmd/certificates/certificates.go | 2 +- pkg/kubectl/cmd/clusterinfo/BUILD | 2 +- pkg/kubectl/cmd/clusterinfo/clusterinfo.go | 2 +- pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go | 2 +- pkg/kubectl/cmd/cmd.go | 2 +- pkg/kubectl/cmd/completion/BUILD | 2 +- pkg/kubectl/cmd/completion/completion.go | 2 +- pkg/kubectl/cmd/config/BUILD | 2 +- pkg/kubectl/cmd/config/config.go | 2 +- pkg/kubectl/cmd/config/create_authinfo.go | 2 +- pkg/kubectl/cmd/config/create_cluster.go | 2 +- pkg/kubectl/cmd/config/create_context.go | 2 +- pkg/kubectl/cmd/config/current_context.go | 2 +- pkg/kubectl/cmd/config/delete_cluster.go | 2 +- pkg/kubectl/cmd/config/delete_context.go | 2 +- pkg/kubectl/cmd/config/get_clusters.go | 2 +- pkg/kubectl/cmd/config/get_contexts.go | 2 +- pkg/kubectl/cmd/config/set.go | 2 +- pkg/kubectl/cmd/config/unset.go | 2 +- pkg/kubectl/cmd/config/use_context.go | 2 +- pkg/kubectl/cmd/config/view.go | 2 +- pkg/kubectl/cmd/convert/BUILD | 2 +- pkg/kubectl/cmd/convert/convert.go | 2 +- pkg/kubectl/cmd/cp/BUILD | 2 +- pkg/kubectl/cmd/cp/cp.go | 2 +- pkg/kubectl/cmd/create/BUILD | 2 +- pkg/kubectl/cmd/create/create.go | 2 +- pkg/kubectl/cmd/create/create_clusterrole.go | 2 +- .../cmd/create/create_clusterrolebinding.go | 2 +- pkg/kubectl/cmd/create/create_configmap.go | 2 +- pkg/kubectl/cmd/create/create_deployment.go | 2 +- pkg/kubectl/cmd/create/create_job.go | 2 +- pkg/kubectl/cmd/create/create_namespace.go | 2 +- pkg/kubectl/cmd/create/create_pdb.go | 2 +- pkg/kubectl/cmd/create/create_priorityclass.go | 2 +- pkg/kubectl/cmd/create/create_quota.go | 2 +- pkg/kubectl/cmd/create/create_role.go | 2 +- pkg/kubectl/cmd/create/create_rolebinding.go | 2 +- pkg/kubectl/cmd/create/create_secret.go | 2 +- pkg/kubectl/cmd/create/create_service.go | 2 +- pkg/kubectl/cmd/create/create_serviceaccount.go | 2 +- pkg/kubectl/cmd/delete/BUILD | 2 +- pkg/kubectl/cmd/delete/delete.go | 2 +- pkg/kubectl/cmd/describe/BUILD | 2 +- pkg/kubectl/cmd/describe/describe.go | 2 +- pkg/kubectl/cmd/diff/BUILD | 2 +- pkg/kubectl/cmd/diff/diff.go | 2 +- pkg/kubectl/cmd/drain/BUILD | 2 +- pkg/kubectl/cmd/drain/drain.go | 2 +- pkg/kubectl/cmd/edit/BUILD | 2 +- pkg/kubectl/cmd/edit/edit.go | 2 +- pkg/kubectl/cmd/exec/BUILD | 2 +- pkg/kubectl/cmd/exec/exec.go | 2 +- pkg/kubectl/cmd/explain/BUILD | 2 +- pkg/kubectl/cmd/explain/explain.go | 2 +- pkg/kubectl/cmd/expose/BUILD | 2 +- pkg/kubectl/cmd/expose/expose.go | 2 +- pkg/kubectl/cmd/get/BUILD | 2 +- pkg/kubectl/cmd/get/get.go | 2 +- pkg/kubectl/cmd/help/BUILD | 2 +- pkg/kubectl/cmd/help/help.go | 2 +- pkg/kubectl/cmd/kustomize/BUILD | 2 +- pkg/kubectl/cmd/kustomize/kustomize.go | 2 +- pkg/kubectl/cmd/label/BUILD | 2 +- pkg/kubectl/cmd/label/label.go | 2 +- pkg/kubectl/cmd/logs/BUILD | 2 +- pkg/kubectl/cmd/logs/logs.go | 2 +- pkg/kubectl/cmd/options/BUILD | 2 +- pkg/kubectl/cmd/options/options.go | 2 +- pkg/kubectl/cmd/patch/BUILD | 2 +- pkg/kubectl/cmd/patch/patch.go | 2 +- pkg/kubectl/cmd/plugin/BUILD | 2 +- pkg/kubectl/cmd/plugin/plugin.go | 2 +- pkg/kubectl/cmd/portforward/BUILD | 2 +- pkg/kubectl/cmd/portforward/portforward.go | 2 +- pkg/kubectl/cmd/proxy/BUILD | 2 +- pkg/kubectl/cmd/proxy/proxy.go | 2 +- pkg/kubectl/cmd/replace/BUILD | 2 +- pkg/kubectl/cmd/replace/replace.go | 2 +- pkg/kubectl/cmd/rollingupdate/BUILD | 2 +- pkg/kubectl/cmd/rollingupdate/rollingupdate.go | 2 +- pkg/kubectl/cmd/rollout/BUILD | 2 +- pkg/kubectl/cmd/rollout/rollout.go | 2 +- pkg/kubectl/cmd/rollout/rollout_history.go | 2 +- pkg/kubectl/cmd/rollout/rollout_pause.go | 2 +- pkg/kubectl/cmd/rollout/rollout_restart.go | 2 +- pkg/kubectl/cmd/rollout/rollout_resume.go | 2 +- pkg/kubectl/cmd/rollout/rollout_status.go | 2 +- pkg/kubectl/cmd/rollout/rollout_undo.go | 2 +- pkg/kubectl/cmd/run/BUILD | 4 ++-- pkg/kubectl/cmd/run/run.go | 2 +- pkg/kubectl/cmd/run/run_test.go | 2 +- pkg/kubectl/cmd/scale/BUILD | 2 +- pkg/kubectl/cmd/scale/scale.go | 2 +- pkg/kubectl/cmd/set/BUILD | 2 +- pkg/kubectl/cmd/set/set.go | 2 +- pkg/kubectl/cmd/set/set_image.go | 2 +- pkg/kubectl/cmd/set/set_resources.go | 2 +- pkg/kubectl/cmd/set/set_selector.go | 2 +- pkg/kubectl/cmd/set/set_serviceaccount.go | 2 +- pkg/kubectl/cmd/set/set_subject.go | 2 +- pkg/kubectl/cmd/taint/BUILD | 2 +- pkg/kubectl/cmd/taint/taint.go | 2 +- pkg/kubectl/cmd/top/BUILD | 2 +- pkg/kubectl/cmd/top/top.go | 2 +- pkg/kubectl/cmd/top/top_node.go | 2 +- pkg/kubectl/cmd/top/top_pod.go | 2 +- pkg/kubectl/cmd/version/BUILD | 2 +- pkg/kubectl/cmd/version/version.go | 2 +- pkg/kubectl/util/BUILD | 5 +---- staging/src/k8s.io/kubectl/BUILD | 1 + staging/src/k8s.io/kubectl/go.mod | 1 + staging/src/k8s.io/kubectl/go.sum | 2 ++ .../src/k8s.io/kubectl/pkg}/generated/BUILD | 3 ++- .../src/k8s.io/kubectl/pkg}/generated/bindata.go | 0 staging/src/k8s.io/kubectl/pkg/util/BUILD | 1 + .../src/k8s.io/kubectl/pkg}/util/i18n/BUILD | 15 ++++++--------- .../src/k8s.io/kubectl/pkg}/util/i18n/i18n.go | 2 +- .../k8s.io/kubectl/pkg}/util/i18n/i18n_test.go | 0 translations/README.md | 2 +- vendor/modules.txt | 2 ++ 140 files changed, 145 insertions(+), 145 deletions(-) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generated/BUILD (78%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/generated/bindata.go (100%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/i18n/BUILD (62%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/i18n/i18n.go (98%) rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/i18n/i18n_test.go (100%) diff --git a/go.mod b/go.mod index ab2c1a83c16..8271af748a2 100644 --- a/go.mod +++ b/go.mod @@ -26,7 +26,6 @@ require ( github.com/boltdb/bolt v1.3.1 // indirect github.com/caddyserver/caddy v1.0.1 github.com/cespare/prettybench v0.0.0-20150116022406-03b8cfe5406c - github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 github.com/checkpoint-restore/go-criu v0.0.0-20190109184317-bdb7599cd87b // indirect github.com/client9/misspell v0.3.4 github.com/cloudflare/cfssl v0.0.0-20180726162950-56268a613adf diff --git a/hack/boilerplate/boilerplate.py b/hack/boilerplate/boilerplate.py index efba05bf8dc..d5d901eeb8a 100755 --- a/hack/boilerplate/boilerplate.py +++ b/hack/boilerplate/boilerplate.py @@ -149,7 +149,7 @@ def file_extension(filename): skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git', 'cluster/env.sh', "vendor", "test/e2e/generated/bindata.go", "hack/boilerplate/test", - "pkg/kubectl/generated/bindata.go"] + "staging/src/k8s.io/kubectl/pkg/generated/bindata.go"] # list all the files contain 'DO NOT EDIT', but are not generated skipped_ungenerated_files = ['hack/lib/swagger.sh', 'hack/boilerplate/boilerplate.py'] diff --git a/hack/generate-bindata.sh b/hack/generate-bindata.sh index 995f1d17f56..f8cb2768ff2 100755 --- a/hack/generate-bindata.sh +++ b/hack/generate-bindata.sh @@ -65,7 +65,7 @@ fi rm -f "${BINDATA_OUTPUT}.tmp" # These are files for runtime code -BINDATA_OUTPUT="pkg/kubectl/generated/bindata.go" +BINDATA_OUTPUT="staging/src/k8s.io/kubectl/pkg/generated/bindata.go" # IMPORTANT: if you make any changes to these arguments, you must also update # pkg/generated/BUILD and/or build/bindata.bzl. go-bindata -nometadata -nocompress -o "${BINDATA_OUTPUT}.tmp" -pkg generated \ diff --git a/pkg/kubectl/BUILD b/pkg/kubectl/BUILD index 8590b477ff2..a189c264bc9 100644 --- a/pkg/kubectl/BUILD +++ b/pkg/kubectl/BUILD @@ -87,7 +87,6 @@ filegroup( "//pkg/kubectl/describe:all-srcs", "//pkg/kubectl/explain:all-srcs", "//pkg/kubectl/generate:all-srcs", - "//pkg/kubectl/generated:all-srcs", "//pkg/kubectl/metricsutil:all-srcs", "//pkg/kubectl/polymorphichelpers:all-srcs", "//pkg/kubectl/proxy:all-srcs", diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 8afa451a564..08015991cc4 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -57,10 +57,10 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/version:go_default_library", "//pkg/kubectl/cmd/wait:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library", "//staging/src/k8s.io/component-base/cli/flag: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", diff --git a/pkg/kubectl/cmd/alpha.go b/pkg/kubectl/cmd/alpha.go index 5af82513977..1035f54091d 100644 --- a/pkg/kubectl/cmd/alpha.go +++ b/pkg/kubectl/cmd/alpha.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // NewCmdAlpha creates a command that acts as an alternate root command for features in alpha diff --git a/pkg/kubectl/cmd/annotate/BUILD b/pkg/kubectl/cmd/annotate/BUILD index e45a1681d19..6dcdff4885b 100644 --- a/pkg/kubectl/cmd/annotate/BUILD +++ b/pkg/kubectl/cmd/annotate/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -18,6 +17,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/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", "//vendor/github.com/evanphx/json-patch:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/annotate/annotate.go b/pkg/kubectl/cmd/annotate/annotate.go index b341687a7e0..18390708a86 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // AnnotateOptions have the data required to perform the annotate operation diff --git a/pkg/kubectl/cmd/apiresources/BUILD b/pkg/kubectl/cmd/apiresources/BUILD index 39c2d9fac7a..150cd102283 100644 --- a/pkg/kubectl/cmd/apiresources/BUILD +++ b/pkg/kubectl/cmd/apiresources/BUILD @@ -10,13 +10,13 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/apiresources/apiversions.go b/pkg/kubectl/cmd/apiresources/apiversions.go index 29a53839617..fbc25ae2410 100644 --- a/pkg/kubectl/cmd/apiresources/apiversions.go +++ b/pkg/kubectl/cmd/apiresources/apiversions.go @@ -25,9 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/apply/BUILD b/pkg/kubectl/cmd/apply/BUILD index b1e5467d169..3e34835b99f 100644 --- a/pkg/kubectl/cmd/apply/BUILD +++ b/pkg/kubectl/cmd/apply/BUILD @@ -15,7 +15,6 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/editor:go_default_library", "//pkg/kubectl/cmd/util/openapi: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", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -36,6 +35,7 @@ go_library( "//staging/src/k8s.io/client-go/dynamic: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/jonboulle/clockwork:go_default_library", diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go index 2b1a87a6801..cf326394bbf 100644 --- a/pkg/kubectl/cmd/apply/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -48,12 +48,12 @@ import ( oapi "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // ApplyOptions defines flags and other configuration parameters for the `apply` command diff --git a/pkg/kubectl/cmd/apply/apply_set_last_applied.go b/pkg/kubectl/cmd/apply/apply_set_last_applied.go index 9a0f7cad5ab..14e2b40b27e 100644 --- a/pkg/kubectl/cmd/apply/apply_set_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_set_last_applied.go @@ -31,10 +31,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // SetLastAppliedOptions defines options for the `apply set-last-applied` command.` diff --git a/pkg/kubectl/cmd/apply/apply_view_last_applied.go b/pkg/kubectl/cmd/apply/apply_view_last_applied.go index 9c09b7e6ec7..57ac04a9962 100644 --- a/pkg/kubectl/cmd/apply/apply_view_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_view_last_applied.go @@ -25,9 +25,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "sigs.k8s.io/yaml" ) diff --git a/pkg/kubectl/cmd/attach/BUILD b/pkg/kubectl/cmd/attach/BUILD index 285cbe72bd4..aa917d4fb70 100644 --- a/pkg/kubectl/cmd/attach/BUILD +++ b/pkg/kubectl/cmd/attach/BUILD @@ -9,7 +9,6 @@ go_library( "//pkg/kubectl/cmd/exec:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers: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/runtime:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -17,6 +16,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/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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/attach/attach.go b/pkg/kubectl/cmd/attach/attach.go index e07573f9f2d..9762feb3020 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/exec" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/autoscale/BUILD b/pkg/kubectl/cmd/autoscale/BUILD index 472ebf49e56..b92d2027dd1 100644 --- a/pkg/kubectl/cmd/autoscale/BUILD +++ b/pkg/kubectl/cmd/autoscale/BUILD @@ -9,7 +9,6 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -19,6 +18,7 @@ go_library( "//staging/src/k8s.io/client-go/scale: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/autoscale/autoscale.go b/pkg/kubectl/cmd/autoscale/autoscale.go index 293e83413ad..b04854975c6 100644 --- a/pkg/kubectl/cmd/autoscale/autoscale.go +++ b/pkg/kubectl/cmd/autoscale/autoscale.go @@ -31,11 +31,11 @@ import ( "k8s.io/client-go/scale" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/certificates/BUILD b/pkg/kubectl/cmd/certificates/BUILD index f26f986684e..736c29e3f3a 100644 --- a/pkg/kubectl/cmd/certificates/BUILD +++ b/pkg/kubectl/cmd/certificates/BUILD @@ -7,7 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -17,6 +16,7 @@ go_library( "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/certificates/v1beta1: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/certificates/certificates.go b/pkg/kubectl/cmd/certificates/certificates.go index 17c7f62e8d2..c416a2649f8 100644 --- a/pkg/kubectl/cmd/certificates/certificates.go +++ b/pkg/kubectl/cmd/certificates/certificates.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) func NewCmdCertificate(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { diff --git a/pkg/kubectl/cmd/clusterinfo/BUILD b/pkg/kubectl/cmd/clusterinfo/BUILD index 594108553b3..9822e228394 100644 --- a/pkg/kubectl/cmd/clusterinfo/BUILD +++ b/pkg/kubectl/cmd/clusterinfo/BUILD @@ -11,7 +11,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers: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/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library", @@ -22,6 +21,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/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", "//vendor/github.com/daviddengcn/go-colortext:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go index 846aa57fe5d..c4850106387 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go @@ -28,9 +28,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" restclient "k8s.io/client-go/rest" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ct "github.com/daviddengcn/go-colortext" "github.com/spf13/cobra" diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go index 0b32a0b0bbe..bf40281565f 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) const ( diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index bf0ed3a6981..2e48e7b64d7 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -30,6 +30,7 @@ import ( "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/annotate" "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources" @@ -71,7 +72,6 @@ import ( cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/version" "k8s.io/kubernetes/pkg/kubectl/cmd/wait" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize" diff --git a/pkg/kubectl/cmd/completion/BUILD b/pkg/kubectl/cmd/completion/BUILD index 52a733780ac..cfd9c74523f 100644 --- a/pkg/kubectl/cmd/completion/BUILD +++ b/pkg/kubectl/cmd/completion/BUILD @@ -7,7 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/completion/completion.go b/pkg/kubectl/cmd/completion/completion.go index 7ab032a7705..fc5598547f8 100644 --- a/pkg/kubectl/cmd/completion/completion.go +++ b/pkg/kubectl/cmd/completion/completion.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) const defaultBoilerPlate = ` diff --git a/pkg/kubectl/cmd/config/BUILD b/pkg/kubectl/cmd/config/BUILD index e366387dbe3..56fbf359ae6 100644 --- a/pkg/kubectl/cmd/config/BUILD +++ b/pkg/kubectl/cmd/config/BUILD @@ -29,7 +29,6 @@ go_library( ], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -39,6 +38,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/clientcmd/api/latest:go_default_library", "//staging/src/k8s.io/component-base/cli/flag: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/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/liggitt/tabwriter:go_default_library", diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index 2b30d2fb4c2..d5040c17af3 100644 --- a/pkg/kubectl/cmd/config/config.go +++ b/pkg/kubectl/cmd/config/config.go @@ -25,9 +25,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // NewCmdConfig creates a command object for the "config" action, and adds all child commands to it. diff --git a/pkg/kubectl/cmd/config/create_authinfo.go b/pkg/kubectl/cmd/config/create_authinfo.go index e39db6635e7..a6ae675f453 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -29,9 +29,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type createAuthInfoOptions struct { diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index 546f865fa5a..5925fac7541 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type createClusterOptions struct { diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index f283053f8f8..b1eb9f04504 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -26,9 +26,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type createContextOptions struct { diff --git a/pkg/kubectl/cmd/config/current_context.go b/pkg/kubectl/cmd/config/current_context.go index 0ccc85db5d2..9bea229c9ae 100644 --- a/pkg/kubectl/cmd/config/current_context.go +++ b/pkg/kubectl/cmd/config/current_context.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // CurrentContextOptions holds the command-line options for 'config current-context' sub command diff --git a/pkg/kubectl/cmd/config/delete_cluster.go b/pkg/kubectl/cmd/config/delete_cluster.go index 1324d277460..d412b17e560 100644 --- a/pkg/kubectl/cmd/config/delete_cluster.go +++ b/pkg/kubectl/cmd/config/delete_cluster.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/config/delete_context.go b/pkg/kubectl/cmd/config/delete_context.go index d490e912a70..b728251cc82 100644 --- a/pkg/kubectl/cmd/config/delete_context.go +++ b/pkg/kubectl/cmd/config/delete_context.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/config/get_clusters.go b/pkg/kubectl/cmd/config/get_clusters.go index bddf660ed34..2c030b97be0 100644 --- a/pkg/kubectl/cmd/config/get_clusters.go +++ b/pkg/kubectl/cmd/config/get_clusters.go @@ -22,9 +22,9 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/config/get_contexts.go b/pkg/kubectl/cmd/config/get_contexts.go index 0fd6e491e32..a2da8c7fce4 100644 --- a/pkg/kubectl/cmd/config/get_contexts.go +++ b/pkg/kubectl/cmd/config/get_contexts.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // GetContextsOptions contains the assignable options from the args. diff --git a/pkg/kubectl/cmd/config/set.go b/pkg/kubectl/cmd/config/set.go index 2b33da0ebfa..66cd296d3e1 100644 --- a/pkg/kubectl/cmd/config/set.go +++ b/pkg/kubectl/cmd/config/set.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/tools/clientcmd" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type setOptions struct { diff --git a/pkg/kubectl/cmd/config/unset.go b/pkg/kubectl/cmd/config/unset.go index 7511965d9fb..c31d6c6b1e4 100644 --- a/pkg/kubectl/cmd/config/unset.go +++ b/pkg/kubectl/cmd/config/unset.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubectl/pkg/util/templates" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type unsetOptions struct { diff --git a/pkg/kubectl/cmd/config/use_context.go b/pkg/kubectl/cmd/config/use_context.go index e8eca3b17cc..d12570ecc59 100644 --- a/pkg/kubectl/cmd/config/use_context.go +++ b/pkg/kubectl/cmd/config/use_context.go @@ -25,9 +25,9 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index b77623f0bf8..cf3dabeb964 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/tools/clientcmd/api/latest" cliflag "k8s.io/component-base/cli/flag" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // ViewOptions holds the command-line options for 'config view' sub command diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD index a01fd1a16e4..2a6d20ecaa3 100644 --- a/pkg/kubectl/cmd/convert/BUILD +++ b/pkg/kubectl/cmd/convert/BUILD @@ -27,13 +27,13 @@ go_library( "//pkg/apis/settings/install:go_default_library", "//pkg/apis/storage/install:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_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/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/convert/convert.go b/pkg/kubectl/cmd/convert/convert.go index ab37ca43c4a..d6dd9fa90b6 100644 --- a/pkg/kubectl/cmd/convert/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -28,12 +28,12 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" scheme "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/cp/BUILD b/pkg/kubectl/cmd/cp/BUILD index ecc88348e6b..7fecbd24326 100644 --- a/pkg/kubectl/cmd/cp/BUILD +++ b/pkg/kubectl/cmd/cp/BUILD @@ -8,10 +8,10 @@ go_library( deps = [ "//pkg/kubectl/cmd/exec:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/rest: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", "//vendor/github.com/lithammer/dedent:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/cp/cp.go b/pkg/kubectl/cmd/cp/cp.go index 7659cb25c3c..e36c8621565 100644 --- a/pkg/kubectl/cmd/cp/cp.go +++ b/pkg/kubectl/cmd/cp/cp.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/exec" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "bytes" diff --git a/pkg/kubectl/cmd/create/BUILD b/pkg/kubectl/cmd/create/BUILD index 4671cc0d711..9c451e309e3 100644 --- a/pkg/kubectl/cmd/create/BUILD +++ b/pkg/kubectl/cmd/create/BUILD @@ -27,7 +27,6 @@ go_library( "//pkg/kubectl/cmd/util/editor:go_default_library", "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -50,6 +49,7 @@ go_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", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/create/create.go b/pkg/kubectl/cmd/create/create.go index c52ca1637b3..d33256638eb 100644 --- a/pkg/kubectl/cmd/create/create.go +++ b/pkg/kubectl/cmd/create/create.go @@ -38,11 +38,11 @@ import ( "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" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" "k8s.io/kubernetes/pkg/kubectl/generate" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // CreateOptions is the commandline options for 'create' sub command diff --git a/pkg/kubectl/cmd/create/create_clusterrole.go b/pkg/kubectl/cmd/create/create_clusterrole.go index ba9f9e8a4a0..e5193f5fde2 100644 --- a/pkg/kubectl/cmd/create/create_clusterrole.go +++ b/pkg/kubectl/cmd/create/create_clusterrole.go @@ -26,9 +26,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" cliflag "k8s.io/component-base/cli/flag" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding.go b/pkg/kubectl/cmd/create/create_clusterrolebinding.go index 8116297534a..02b145311a7 100644 --- a/pkg/kubectl/cmd/create/create_clusterrolebinding.go +++ b/pkg/kubectl/cmd/create/create_clusterrolebinding.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_configmap.go b/pkg/kubectl/cmd/create/create_configmap.go index f60b6cee10d..1586df9048d 100644 --- a/pkg/kubectl/cmd/create/create_configmap.go +++ b/pkg/kubectl/cmd/create/create_configmap.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_deployment.go b/pkg/kubectl/cmd/create/create_deployment.go index 9d0d54fe730..157f69c6c71 100644 --- a/pkg/kubectl/cmd/create/create_deployment.go +++ b/pkg/kubectl/cmd/create/create_deployment.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_job.go b/pkg/kubectl/cmd/create/create_job.go index 0a7af9fc169..b54d8dd55bc 100644 --- a/pkg/kubectl/cmd/create/create_job.go +++ b/pkg/kubectl/cmd/create/create_job.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" batchv1client "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_namespace.go b/pkg/kubectl/cmd/create/create_namespace.go index a43c4d6f869..9c7b314da2b 100644 --- a/pkg/kubectl/cmd/create/create_namespace.go +++ b/pkg/kubectl/cmd/create/create_namespace.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_pdb.go b/pkg/kubectl/cmd/create/create_pdb.go index 1e3d6c06b60..2064af61b40 100644 --- a/pkg/kubectl/cmd/create/create_pdb.go +++ b/pkg/kubectl/cmd/create/create_pdb.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_priorityclass.go b/pkg/kubectl/cmd/create/create_priorityclass.go index 1ecec7cb80d..22555500f00 100644 --- a/pkg/kubectl/cmd/create/create_priorityclass.go +++ b/pkg/kubectl/cmd/create/create_priorityclass.go @@ -21,11 +21,11 @@ import ( apiv1 "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_quota.go b/pkg/kubectl/cmd/create/create_quota.go index a54fd130b93..3ce2f8c2830 100644 --- a/pkg/kubectl/cmd/create/create_quota.go +++ b/pkg/kubectl/cmd/create/create_quota.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_role.go b/pkg/kubectl/cmd/create/create_role.go index 6cc29d947c8..5a6f9f3a9e6 100644 --- a/pkg/kubectl/cmd/create/create_role.go +++ b/pkg/kubectl/cmd/create/create_role.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" clientgorbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_rolebinding.go b/pkg/kubectl/cmd/create/create_rolebinding.go index 88fbc24dccd..f224a853e4f 100644 --- a/pkg/kubectl/cmd/create/create_rolebinding.go +++ b/pkg/kubectl/cmd/create/create_rolebinding.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/create/create_secret.go b/pkg/kubectl/cmd/create/create_secret.go index eacc1627246..99dd41d5a63 100644 --- a/pkg/kubectl/cmd/create/create_secret.go +++ b/pkg/kubectl/cmd/create/create_secret.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 d0bea0c2cb2..0cb90830f82 100644 --- a/pkg/kubectl/cmd/create/create_service.go +++ b/pkg/kubectl/cmd/create/create_service.go @@ -21,11 +21,11 @@ import ( "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 8ac4e15abcb..e7cc0579f7f 100644 --- a/pkg/kubectl/cmd/create/create_serviceaccount.go +++ b/pkg/kubectl/cmd/create/create_serviceaccount.go @@ -20,11 +20,11 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/delete/BUILD b/pkg/kubectl/cmd/delete/BUILD index a742249bf88..394adc0711e 100644 --- a/pkg/kubectl/cmd/delete/BUILD +++ b/pkg/kubectl/cmd/delete/BUILD @@ -11,7 +11,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/wait:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -21,6 +20,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/rawhttp: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/delete/delete.go b/pkg/kubectl/cmd/delete/delete.go index f21876fac8f..14948322323 100644 --- a/pkg/kubectl/cmd/delete/delete.go +++ b/pkg/kubectl/cmd/delete/delete.go @@ -34,10 +34,10 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/dynamic" "k8s.io/kubectl/pkg/rawhttp" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdwait "k8s.io/kubernetes/pkg/kubectl/cmd/wait" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/describe/BUILD b/pkg/kubectl/cmd/describe/BUILD index 9d01f4dec3b..4d13dea1caa 100644 --- a/pkg/kubectl/cmd/describe/BUILD +++ b/pkg/kubectl/cmd/describe/BUILD @@ -9,13 +9,13 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/describe:go_default_library", "//pkg/kubectl/describe/versioned:go_default_library", - "//pkg/kubectl/util/i18n: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/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/describe/describe.go b/pkg/kubectl/cmd/describe/describe.go index 68e2fa68302..956ca8570c8 100644 --- a/pkg/kubectl/cmd/describe/describe.go +++ b/pkg/kubectl/cmd/describe/describe.go @@ -28,11 +28,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/resource" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/describe" describeversioned "k8s.io/kubernetes/pkg/kubectl/describe/versioned" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/diff/BUILD b/pkg/kubectl/cmd/diff/BUILD index 23a1a4f84ff..4cd0a0299e1 100644 --- a/pkg/kubectl/cmd/diff/BUILD +++ b/pkg/kubectl/cmd/diff/BUILD @@ -9,7 +9,6 @@ go_library( "//pkg/kubectl/cmd/apply:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -22,6 +21,7 @@ go_library( "//staging/src/k8s.io/client-go/dynamic: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/jonboulle/clockwork:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/diff/diff.go b/pkg/kubectl/cmd/diff/diff.go index ab95c8ecc14..e1110417ffe 100644 --- a/pkg/kubectl/cmd/diff/diff.go +++ b/pkg/kubectl/cmd/diff/diff.go @@ -38,11 +38,11 @@ import ( "k8s.io/klog" "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/cmd/apply" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "k8s.io/utils/exec" "sigs.k8s.io/yaml" ) diff --git a/pkg/kubectl/cmd/drain/BUILD b/pkg/kubectl/cmd/drain/BUILD index da900262fdb..ee5415fc760 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/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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -21,6 +20,7 @@ go_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/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/drain/drain.go b/pkg/kubectl/cmd/drain/drain.go index 612022c11b1..0fce417af7e 100644 --- a/pkg/kubectl/cmd/drain/drain.go +++ b/pkg/kubectl/cmd/drain/drain.go @@ -38,9 +38,9 @@ import ( "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/drain" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) type DrainCmdOptions struct { diff --git a/pkg/kubectl/cmd/edit/BUILD b/pkg/kubectl/cmd/edit/BUILD index 843c94e5cf9..25fa30d0d32 100644 --- a/pkg/kubectl/cmd/edit/BUILD +++ b/pkg/kubectl/cmd/edit/BUILD @@ -8,8 +8,8 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/editor:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/edit/edit.go b/pkg/kubectl/cmd/edit/edit.go index 507ab8adf71..b93067f99d9 100644 --- a/pkg/kubectl/cmd/edit/edit.go +++ b/pkg/kubectl/cmd/edit/edit.go @@ -22,10 +22,10 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/exec/BUILD b/pkg/kubectl/cmd/exec/BUILD index b51c6f496cf..7398b3a01c2 100644 --- a/pkg/kubectl/cmd/exec/BUILD +++ b/pkg/kubectl/cmd/exec/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers: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/apis/meta/v1:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -17,6 +16,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/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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/term:go_default_library", diff --git a/pkg/kubectl/cmd/exec/exec.go b/pkg/kubectl/cmd/exec/exec.go index 2dd1cf813aa..a3bb275c790 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" "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" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/explain/BUILD b/pkg/kubectl/cmd/explain/BUILD index a634468e4f3..7024e6c2a0c 100644 --- a/pkg/kubectl/cmd/explain/BUILD +++ b/pkg/kubectl/cmd/explain/BUILD @@ -9,10 +9,10 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/explain:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/explain/explain.go b/pkg/kubectl/cmd/explain/explain.go index 69e9817e81b..b9bf202b170 100644 --- a/pkg/kubectl/cmd/explain/explain.go +++ b/pkg/kubectl/cmd/explain/explain.go @@ -24,11 +24,11 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" "k8s.io/kubernetes/pkg/kubectl/explain" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/expose/BUILD b/pkg/kubectl/cmd/expose/BUILD index c55e2e6ee1b..7c9743dd7b9 100644 --- a/pkg/kubectl/cmd/expose/BUILD +++ b/pkg/kubectl/cmd/expose/BUILD @@ -10,7 +10,6 @@ go_library( "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -23,6 +22,7 @@ go_library( "//staging/src/k8s.io/client-go/dynamic: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/expose/expose.go b/pkg/kubectl/cmd/expose/expose.go index 04de364ddf9..cd17652941b 100644 --- a/pkg/kubectl/cmd/expose/expose.go +++ b/pkg/kubectl/cmd/expose/expose.go @@ -35,12 +35,12 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 62514174069..8c6e6381024 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -31,7 +31,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//pkg/printers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -53,6 +52,7 @@ go_library( "//staging/src/k8s.io/client-go/util/jsonpath: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/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", diff --git a/pkg/kubectl/cmd/get/get.go b/pkg/kubectl/cmd/get/get.go index 36c09df826b..53f55b4f808 100644 --- a/pkg/kubectl/cmd/get/get.go +++ b/pkg/kubectl/cmd/get/get.go @@ -42,11 +42,11 @@ import ( "k8s.io/client-go/rest" watchtools "k8s.io/client-go/tools/watch" "k8s.io/kubectl/pkg/rawhttp" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" utilprinters "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" utilpointer "k8s.io/utils/pointer" ) diff --git a/pkg/kubectl/cmd/help/BUILD b/pkg/kubectl/cmd/help/BUILD index bd08a1d44da..89dde353621 100644 --- a/pkg/kubectl/cmd/help/BUILD +++ b/pkg/kubectl/cmd/help/BUILD @@ -6,7 +6,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/help", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/util/i18n: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/help/help.go b/pkg/kubectl/cmd/help/help.go index e48255612a2..cf8843dbce1 100644 --- a/pkg/kubectl/cmd/help/help.go +++ b/pkg/kubectl/cmd/help/help.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var helpLong = templates.LongDesc(i18n.T(` diff --git a/pkg/kubectl/cmd/kustomize/BUILD b/pkg/kubectl/cmd/kustomize/BUILD index 695f9e8b404..2a0d2635722 100644 --- a/pkg/kubectl/cmd/kustomize/BUILD +++ b/pkg/kubectl/cmd/kustomize/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/kustomize", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/kustomize: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/sigs.k8s.io/kustomize/pkg/fs:go_default_library", diff --git a/pkg/kubectl/cmd/kustomize/kustomize.go b/pkg/kubectl/cmd/kustomize/kustomize.go index 2a2548435d3..5d13098f502 100644 --- a/pkg/kubectl/cmd/kustomize/kustomize.go +++ b/pkg/kubectl/cmd/kustomize/kustomize.go @@ -22,8 +22,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/kustomize" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "sigs.k8s.io/kustomize/pkg/fs" ) diff --git a/pkg/kubectl/cmd/label/BUILD b/pkg/kubectl/cmd/label/BUILD index 463f33ac1fe..c969169b83e 100644 --- a/pkg/kubectl/cmd/label/BUILD +++ b/pkg/kubectl/cmd/label/BUILD @@ -7,7 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n: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/unstructuredscheme:go_default_library", @@ -20,6 +19,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/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", "//vendor/github.com/evanphx/json-patch:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/label/label.go b/pkg/kubectl/cmd/label/label.go index 117355a15f1..5a77f33afe8 100644 --- a/pkg/kubectl/cmd/label/label.go +++ b/pkg/kubectl/cmd/label/label.go @@ -38,9 +38,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // LabelOptions have the data required to perform the label operation diff --git a/pkg/kubectl/cmd/logs/BUILD b/pkg/kubectl/cmd/logs/BUILD index 867b8c8a462..5020754c835 100644 --- a/pkg/kubectl/cmd/logs/BUILD +++ b/pkg/kubectl/cmd/logs/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers: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/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/client-go/rest: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index d5837055e0d..332269c6a19 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -34,10 +34,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) const ( diff --git a/pkg/kubectl/cmd/options/BUILD b/pkg/kubectl/cmd/options/BUILD index de64fee8e44..7b4a8e99c01 100644 --- a/pkg/kubectl/cmd/options/BUILD +++ b/pkg/kubectl/cmd/options/BUILD @@ -6,7 +6,7 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/options", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/util/i18n: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/options/options.go b/pkg/kubectl/cmd/options/options.go index 0772c2062c9..a4e22d0970a 100644 --- a/pkg/kubectl/cmd/options/options.go +++ b/pkg/kubectl/cmd/options/options.go @@ -19,8 +19,8 @@ package options import ( "io" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/patch/BUILD b/pkg/kubectl/cmd/patch/BUILD index f8b40b3011c..343f07d0f1f 100644 --- a/pkg/kubectl/cmd/patch/BUILD +++ b/pkg/kubectl/cmd/patch/BUILD @@ -7,7 +7,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -20,6 +19,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/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", "//vendor/github.com/evanphx/json-patch:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/patch/patch.go b/pkg/kubectl/cmd/patch/patch.go index 3ced3cd2774..6786316d37f 100644 --- a/pkg/kubectl/cmd/patch/patch.go +++ b/pkg/kubectl/cmd/patch/patch.go @@ -37,9 +37,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var patchTypes = map[string]types.PatchType{"json": types.JSONPatchType, "merge": types.MergePatchType, "strategic": types.StrategicMergePatchType} diff --git a/pkg/kubectl/cmd/plugin/BUILD b/pkg/kubectl/cmd/plugin/BUILD index e805576e76b..3a8b4104bf6 100644 --- a/pkg/kubectl/cmd/plugin/BUILD +++ b/pkg/kubectl/cmd/plugin/BUILD @@ -7,8 +7,8 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions: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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/plugin/plugin.go b/pkg/kubectl/cmd/plugin/plugin.go index 7c6a615f8b8..9973a5550e9 100644 --- a/pkg/kubectl/cmd/plugin/plugin.go +++ b/pkg/kubectl/cmd/plugin/plugin.go @@ -28,9 +28,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/portforward/BUILD b/pkg/kubectl/cmd/portforward/BUILD index f904de9a687..4d88c797e59 100644 --- a/pkg/kubectl/cmd/portforward/BUILD +++ b/pkg/kubectl/cmd/portforward/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers: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/apis/meta/v1:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", @@ -18,6 +17,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/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", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/portforward/portforward.go b/pkg/kubectl/cmd/portforward/portforward.go index 0ac89b3854d..261437b8438 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" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // PortForwardOptions contains all the options for running the port-forward cli command. diff --git a/pkg/kubectl/cmd/proxy/BUILD b/pkg/kubectl/cmd/proxy/BUILD index ce492d0ed71..6373171f6dd 100644 --- a/pkg/kubectl/cmd/proxy/BUILD +++ b/pkg/kubectl/cmd/proxy/BUILD @@ -8,8 +8,8 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/proxy:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/proxy/proxy.go b/pkg/kubectl/cmd/proxy/proxy.go index 4299fdef2e5..df72ac9ba64 100644 --- a/pkg/kubectl/cmd/proxy/proxy.go +++ b/pkg/kubectl/cmd/proxy/proxy.go @@ -27,10 +27,10 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/klog" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/proxy" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/replace/BUILD b/pkg/kubectl/cmd/replace/BUILD index ef63008f271..799ad5fd909 100644 --- a/pkg/kubectl/cmd/replace/BUILD +++ b/pkg/kubectl/cmd/replace/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl/cmd/delete:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", @@ -17,6 +16,7 @@ go_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", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/replace/replace.go b/pkg/kubectl/cmd/replace/replace.go index 75cc54d834b..4634be71184 100644 --- a/pkg/kubectl/cmd/replace/replace.go +++ b/pkg/kubectl/cmd/replace/replace.go @@ -37,11 +37,11 @@ import ( "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/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/rollingupdate/BUILD b/pkg/kubectl/cmd/rollingupdate/BUILD index f3d85139a51..7130b2ec8ef 100644 --- a/pkg/kubectl/cmd/rollingupdate/BUILD +++ b/pkg/kubectl/cmd/rollingupdate/BUILD @@ -8,7 +8,6 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -21,6 +20,7 @@ go_library( "//staging/src/k8s.io/client-go/scale: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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//staging/src/k8s.io/kubectl/pkg/validation:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go index 11419437bac..0cae03b0b05 100644 --- a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -36,11 +36,11 @@ import ( scaleclient "k8s.io/client-go/scale" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubectl/pkg/validation" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/rollout/BUILD b/pkg/kubectl/cmd/rollout/BUILD index f407fe50978..062b5145119 100644 --- a/pkg/kubectl/cmd/rollout/BUILD +++ b/pkg/kubectl/cmd/rollout/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/kubectl/cmd/set:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -40,6 +39,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/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", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/lithammer/dedent:go_default_library", diff --git a/pkg/kubectl/cmd/rollout/rollout.go b/pkg/kubectl/cmd/rollout/rollout.go index 2f601237298..a37006f2084 100644 --- a/pkg/kubectl/cmd/rollout/rollout.go +++ b/pkg/kubectl/cmd/rollout/rollout.go @@ -20,9 +20,9 @@ import ( "github.com/lithammer/dedent" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index 0a35699e515..6dfaac23528 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index f4f18833530..f6cc1188027 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 13269721808..1522d4a10e0 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 0edbb6e020e..c4f0c363852 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/set" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 efd01543f47..1f63935f8ca 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index 745fcf51ef0..41cc58760c2 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -26,9 +26,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // UndoOptions 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/run/BUILD b/pkg/kubectl/cmd/run/BUILD index 2670cadfa3e..07fcdd7b56c 100644 --- a/pkg/kubectl/cmd/run/BUILD +++ b/pkg/kubectl/cmd/run/BUILD @@ -15,7 +15,6 @@ go_library( "//pkg/kubectl/generate:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", "//pkg/kubectl/polymorphichelpers: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", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", @@ -33,6 +32,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/watch: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", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/docker/distribution/reference:go_default_library", @@ -50,7 +50,6 @@ go_test( "//pkg/kubectl/cmd/delete:go_default_library", "//pkg/kubectl/cmd/testing:go_default_library", "//pkg/kubectl/cmd/util: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/equality:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", @@ -60,6 +59,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/kubectl/pkg/scheme:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/run/run.go b/pkg/kubectl/cmd/run/run.go index cc8470b46f6..e1c86365ddb 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -42,6 +42,7 @@ import ( watchtools "k8s.io/client-go/tools/watch" "k8s.io/kubectl/pkg/scheme" "k8s.io/kubectl/pkg/util" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl" @@ -53,7 +54,6 @@ import ( "k8s.io/kubernetes/pkg/kubectl/generate" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" uexec "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/run/run_test.go b/pkg/kubectl/cmd/run/run_test.go index 25c0ce5d8a1..6a2a552cb77 100644 --- a/pkg/kubectl/cmd/run/run_test.go +++ b/pkg/kubectl/cmd/run/run_test.go @@ -37,10 +37,10 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/rest/fake" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) func TestGetRestartPolicy(t *testing.T) { diff --git a/pkg/kubectl/cmd/scale/BUILD b/pkg/kubectl/cmd/scale/BUILD index e05b69c8fb9..20ca6126171 100644 --- a/pkg/kubectl/cmd/scale/BUILD +++ b/pkg/kubectl/cmd/scale/BUILD @@ -8,13 +8,13 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_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/client-go/kubernetes: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/scale/scale.go b/pkg/kubectl/cmd/scale/scale.go index c7f1014cd55..b2cbaf72037 100644 --- a/pkg/kubectl/cmd/scale/scale.go +++ b/pkg/kubectl/cmd/scale/scale.go @@ -29,10 +29,10 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/client-go/kubernetes" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" "k8s.io/kubernetes/pkg/kubectl" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index 27c6b87b81a..4d496002f74 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -23,7 +23,6 @@ go_library( "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/generate/versioned:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", - "//pkg/kubectl/util/i18n: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", @@ -39,6 +38,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/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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/set/set.go b/pkg/kubectl/cmd/set/set.go index fa05d139959..9596039f14b 100644 --- a/pkg/kubectl/cmd/set/set.go +++ b/pkg/kubectl/cmd/set/set.go @@ -19,9 +19,9 @@ package set import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index 84e8e57b0a6..5b2bca59075 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // 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 ff8564db266..2060e8100e2 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" generateversioned "k8s.io/kubernetes/pkg/kubectl/generate/versioned" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/set/set_selector.go b/pkg/kubectl/cmd/set/set_selector.go index 86a3cf85197..e103bdb7174 100644 --- a/pkg/kubectl/cmd/set/set_selector.go +++ b/pkg/kubectl/cmd/set/set_selector.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // SetSelectorOptions 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_serviceaccount.go b/pkg/kubectl/cmd/set/set_serviceaccount.go index 513b47690b7..35aa276216f 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" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/set/set_subject.go b/pkg/kubectl/cmd/set/set_subject.go index a8cde2f6f72..6dc466dd5c5 100644 --- a/pkg/kubectl/cmd/set/set_subject.go +++ b/pkg/kubectl/cmd/set/set_subject.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) var ( diff --git a/pkg/kubectl/cmd/taint/BUILD b/pkg/kubectl/cmd/taint/BUILD index fb3720a99f6..d3063543ab4 100644 --- a/pkg/kubectl/cmd/taint/BUILD +++ b/pkg/kubectl/cmd/taint/BUILD @@ -10,7 +10,6 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util: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/meta:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", @@ -23,6 +22,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/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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/k8s.io/klog:go_default_library", diff --git a/pkg/kubectl/cmd/taint/taint.go b/pkg/kubectl/cmd/taint/taint.go index 9fcbaebfaea..112d5970611 100644 --- a/pkg/kubectl/cmd/taint/taint.go +++ b/pkg/kubectl/cmd/taint/taint.go @@ -34,9 +34,9 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/cli-runtime/pkg/resource" "k8s.io/kubectl/pkg/scheme" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" ) // TaintOptions have the data required to perform the taint operation diff --git a/pkg/kubectl/cmd/top/BUILD b/pkg/kubectl/cmd/top/BUILD index e23611d8baa..f2a327a3191 100644 --- a/pkg/kubectl/cmd/top/BUILD +++ b/pkg/kubectl/cmd/top/BUILD @@ -12,13 +12,13 @@ go_library( deps = [ "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/metricsutil: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/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1: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", "//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1beta1:go_default_library", diff --git a/pkg/kubectl/cmd/top/top.go b/pkg/kubectl/cmd/top/top.go index 60a771e5722..2f3ae98dd18 100644 --- a/pkg/kubectl/cmd/top/top.go +++ b/pkg/kubectl/cmd/top/top.go @@ -21,9 +21,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" metricsapi "k8s.io/metrics/pkg/apis/metrics" ) diff --git a/pkg/kubectl/cmd/top/top_node.go b/pkg/kubectl/cmd/top/top_node.go index 82b74f4db5f..92f92877d01 100644 --- a/pkg/kubectl/cmd/top/top_node.go +++ b/pkg/kubectl/cmd/top/top_node.go @@ -27,10 +27,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" metricsapi "k8s.io/metrics/pkg/apis/metrics" metricsV1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned" diff --git a/pkg/kubectl/cmd/top/top_pod.go b/pkg/kubectl/cmd/top/top_pod.go index 0727b695c85..be9e9bfacc9 100644 --- a/pkg/kubectl/cmd/top/top_pod.go +++ b/pkg/kubectl/cmd/top/top_pod.go @@ -26,10 +26,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/discovery" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" metricsapi "k8s.io/metrics/pkg/apis/metrics" metricsv1beta1api "k8s.io/metrics/pkg/apis/metrics/v1beta1" metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned" diff --git a/pkg/kubectl/cmd/version/BUILD b/pkg/kubectl/cmd/version/BUILD index 178087c0c1f..a1f18baf91d 100644 --- a/pkg/kubectl/cmd/version/BUILD +++ b/pkg/kubectl/cmd/version/BUILD @@ -7,12 +7,12 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/util:go_default_library", - "//pkg/kubectl/util/i18n:go_default_library", "//pkg/kubectl/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/version:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/tools/clientcmd: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", "//vendor/github.com/spf13/cobra:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", diff --git a/pkg/kubectl/cmd/version/version.go b/pkg/kubectl/cmd/version/version.go index ae30d0857aa..5f0c59adc30 100644 --- a/pkg/kubectl/cmd/version/version.go +++ b/pkg/kubectl/cmd/version/version.go @@ -28,9 +28,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" "k8s.io/client-go/tools/clientcmd" + "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" - "k8s.io/kubernetes/pkg/kubectl/util/i18n" "k8s.io/kubernetes/pkg/kubectl/version" ) diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 2f4449863e8..2fee60ac349 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -7,10 +7,7 @@ filegroup( filegroup( name = "all-srcs", - srcs = [ - ":package-srcs", - "//pkg/kubectl/util/i18n:all-srcs", - ], + srcs = [":package-srcs"], tags = ["automanaged"], visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"], ) diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD index 60bd720c7e6..71cc083e30a 100644 --- a/staging/src/k8s.io/kubectl/BUILD +++ b/staging/src/k8s.io/kubectl/BUILD @@ -11,6 +11,7 @@ filegroup( ":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/generated: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.mod b/staging/src/k8s.io/kubectl/go.mod index c156465d7b0..0fcac27bb2c 100644 --- a/staging/src/k8s.io/kubectl/go.mod +++ b/staging/src/k8s.io/kubectl/go.mod @@ -7,6 +7,7 @@ go 1.12 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd + github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de diff --git a/staging/src/k8s.io/kubectl/go.sum b/staging/src/k8s.io/kubectl/go.sum index c3fef5eb39f..f64e801e12b 100644 --- a/staging/src/k8s.io/kubectl/go.sum +++ b/staging/src/k8s.io/kubectl/go.sum @@ -13,6 +13,8 @@ github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdko github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5 h1:7aWHqerlJ41y6FOsEUvknqgXnGmJyJSbjhAWq5pO4F8= +github.com/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= diff --git a/pkg/kubectl/generated/BUILD b/staging/src/k8s.io/kubectl/pkg/generated/BUILD similarity index 78% rename from pkg/kubectl/generated/BUILD rename to staging/src/k8s.io/kubectl/pkg/generated/BUILD index 9ab5fd6ccdd..5db95a2caf0 100644 --- a/pkg/kubectl/generated/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/generated/BUILD @@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["bindata.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/generated", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/generated", + importpath = "k8s.io/kubectl/pkg/generated", visibility = ["//visibility:public"], ) diff --git a/pkg/kubectl/generated/bindata.go b/staging/src/k8s.io/kubectl/pkg/generated/bindata.go similarity index 100% rename from pkg/kubectl/generated/bindata.go rename to staging/src/k8s.io/kubectl/pkg/generated/bindata.go diff --git a/staging/src/k8s.io/kubectl/pkg/util/BUILD b/staging/src/k8s.io/kubectl/pkg/util/BUILD index a4b8667beb8..a3dce802e0e 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/BUILD @@ -84,6 +84,7 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs", + "//staging/src/k8s.io/kubectl/pkg/util/i18n:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", diff --git a/pkg/kubectl/util/i18n/BUILD b/staging/src/k8s.io/kubectl/pkg/util/i18n/BUILD similarity index 62% rename from pkg/kubectl/util/i18n/BUILD rename to staging/src/k8s.io/kubectl/pkg/util/i18n/BUILD index 7cfcf07abed..014bd09bd84 100644 --- a/pkg/kubectl/util/i18n/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/i18n/BUILD @@ -1,17 +1,13 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", srcs = ["i18n.go"], - importpath = "k8s.io/kubernetes/pkg/kubectl/util/i18n", + importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/i18n", + importpath = "k8s.io/kubectl/pkg/util/i18n", + visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/generated:go_default_library", + "//staging/src/k8s.io/kubectl/pkg/generated:go_default_library", "//vendor/github.com/chai2010/gettext-go/gettext:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], @@ -34,4 +30,5 @@ filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], + visibility = ["//visibility:public"], ) diff --git a/pkg/kubectl/util/i18n/i18n.go b/staging/src/k8s.io/kubectl/pkg/util/i18n/i18n.go similarity index 98% rename from pkg/kubectl/util/i18n/i18n.go rename to staging/src/k8s.io/kubectl/pkg/util/i18n/i18n.go index a4ff9ac036d..2e2bc2ff983 100644 --- a/pkg/kubectl/util/i18n/i18n.go +++ b/staging/src/k8s.io/kubectl/pkg/util/i18n/i18n.go @@ -24,7 +24,7 @@ import ( "os" "strings" - "k8s.io/kubernetes/pkg/kubectl/generated" + "k8s.io/kubectl/pkg/generated" "github.com/chai2010/gettext-go/gettext" "k8s.io/klog" diff --git a/pkg/kubectl/util/i18n/i18n_test.go b/staging/src/k8s.io/kubectl/pkg/util/i18n/i18n_test.go similarity index 100% rename from pkg/kubectl/util/i18n/i18n_test.go rename to staging/src/k8s.io/kubectl/pkg/util/i18n/i18n_test.go diff --git a/translations/README.md b/translations/README.md index c66956a57a3..ea8802c1d83 100644 --- a/translations/README.md +++ b/translations/README.md @@ -11,7 +11,7 @@ no need to update `translations/test/...` which is only used for unit tests. There is an example [PR here](https://github.com/kubernetes/kubernetes/pull/40645) which adds support for French. Once you've added a new language, you'll need to register it in -`pkg/kubectl/util/i18n/i18n.go` by adding it to the `knownTranslations` map. +`staging/src/k8s.io/kubectl/pkg/util/i18n/i18n.go` by adding it to the `knownTranslations` map. ## Wrapping strings There is a simple script in `translations/extract.py` that performs diff --git a/vendor/modules.txt b/vendor/modules.txt index 0f3633eb6c0..542700fad97 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1643,6 +1643,7 @@ 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/generated k8s.io/kubectl/pkg/rawhttp k8s.io/kubectl/pkg/scheme k8s.io/kubectl/pkg/util @@ -1651,6 +1652,7 @@ k8s.io/kubectl/pkg/util/deployment k8s.io/kubectl/pkg/util/event k8s.io/kubectl/pkg/util/fieldpath k8s.io/kubectl/pkg/util/hash +k8s.io/kubectl/pkg/util/i18n k8s.io/kubectl/pkg/util/interrupt k8s.io/kubectl/pkg/util/logs k8s.io/kubectl/pkg/util/podutils