From 21789b85a6644d2458b71238900fc19a4bd4b385 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 10 Oct 2018 20:29:30 +0200 Subject: [PATCH 1/3] Move pkg/kubectl/cmd/templates -> pkg/kubectl/util/temlpates --- hack/.golint_failures | 2 +- pkg/kubectl/cmd/alpha.go | 2 +- pkg/kubectl/cmd/annotate/annotate.go | 2 +- pkg/kubectl/cmd/apiresources/apiresources.go | 2 +- pkg/kubectl/cmd/apiresources/apiversions.go | 2 +- pkg/kubectl/cmd/apply/apply.go | 2 +- pkg/kubectl/cmd/apply/apply_edit_last_applied.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/attach.go | 2 +- pkg/kubectl/cmd/auth/cani.go | 2 +- pkg/kubectl/cmd/auth/reconcile.go | 2 +- pkg/kubectl/cmd/autoscale/autoscale.go | 2 +- pkg/kubectl/cmd/certificates/certificates.go | 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/completion.go | 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/rename_context.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/convert.go | 2 +- pkg/kubectl/cmd/cp/cp.go | 2 +- pkg/kubectl/cmd/create/create.go | 2 +- pkg/kubectl/cmd/create/create_clusterrole.go | 2 +- pkg/kubectl/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/delete.go | 2 +- pkg/kubectl/cmd/describe/describe.go | 2 +- pkg/kubectl/cmd/diff/diff.go | 2 +- pkg/kubectl/cmd/drain/drain.go | 2 +- pkg/kubectl/cmd/edit/edit.go | 2 +- pkg/kubectl/cmd/exec/exec.go | 2 +- pkg/kubectl/cmd/explain/explain.go | 2 +- pkg/kubectl/cmd/expose/expose.go | 2 +- pkg/kubectl/cmd/get/get.go | 2 +- pkg/kubectl/cmd/help/help.go | 2 +- pkg/kubectl/cmd/label/label.go | 2 +- pkg/kubectl/cmd/logs/logs.go | 2 +- pkg/kubectl/cmd/options/options.go | 2 +- pkg/kubectl/cmd/patch/patch.go | 2 +- pkg/kubectl/cmd/plugin/plugin.go | 2 +- pkg/kubectl/cmd/portforward/portforward.go | 2 +- pkg/kubectl/cmd/proxy/proxy.go | 2 +- pkg/kubectl/cmd/replace/replace.go | 2 +- pkg/kubectl/cmd/rollingupdate/rollingupdate.go | 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_resume.go | 2 +- pkg/kubectl/cmd/rollout/rollout_status.go | 2 +- pkg/kubectl/cmd/rollout/rollout_undo.go | 2 +- pkg/kubectl/cmd/run/run.go | 2 +- pkg/kubectl/cmd/scale/scale.go | 2 +- pkg/kubectl/cmd/set/set.go | 2 +- pkg/kubectl/cmd/set/set_env.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/taint.go | 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/util/printing.go | 2 +- pkg/kubectl/cmd/util/sanity/cmd_sanity.go | 3 ++- pkg/kubectl/cmd/version/version.go | 2 +- pkg/kubectl/cmd/wait/wait.go | 2 +- pkg/kubectl/{cmd => util}/templates/BUILD | 0 pkg/kubectl/{cmd => util}/templates/command_groups.go | 0 pkg/kubectl/{cmd => util}/templates/markdown.go | 0 pkg/kubectl/{cmd => util}/templates/normalizers.go | 0 pkg/kubectl/{cmd => util}/templates/templater.go | 0 pkg/kubectl/{cmd => util}/templates/templates.go | 0 97 files changed, 92 insertions(+), 91 deletions(-) rename pkg/kubectl/{cmd => util}/templates/BUILD (100%) rename pkg/kubectl/{cmd => util}/templates/command_groups.go (100%) rename pkg/kubectl/{cmd => util}/templates/markdown.go (100%) rename pkg/kubectl/{cmd => util}/templates/normalizers.go (100%) rename pkg/kubectl/{cmd => util}/templates/templater.go (100%) rename pkg/kubectl/{cmd => util}/templates/templates.go (100%) diff --git a/hack/.golint_failures b/hack/.golint_failures index c112d374c3..b3c4924a7b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -182,7 +182,6 @@ pkg/kubectl/cmd/run pkg/kubectl/cmd/scale pkg/kubectl/cmd/set pkg/kubectl/cmd/taint -pkg/kubectl/cmd/templates pkg/kubectl/cmd/testing pkg/kubectl/cmd/top pkg/kubectl/cmd/util @@ -194,6 +193,7 @@ pkg/kubectl/cmd/wait pkg/kubectl/metricsutil pkg/kubectl/util pkg/kubectl/util/slice +pkg/kubectl/util/templates pkg/kubelet pkg/kubelet/apis pkg/kubelet/apis/config diff --git a/pkg/kubectl/cmd/alpha.go b/pkg/kubectl/cmd/alpha.go index cb78568d95..9fa8fde545 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // NewCmdAlpha creates a command that acts as an alternate root command for features in alpha diff --git a/pkg/kubectl/cmd/annotate/annotate.go b/pkg/kubectl/cmd/annotate/annotate.go index 4bfb907bf3..29b1b73fa9 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/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // AnnotateOptions have the data required to perform the annotate operation diff --git a/pkg/kubectl/cmd/apiresources/apiresources.go b/pkg/kubectl/cmd/apiresources/apiresources.go index 3f33cc5e2f..97173b9dc0 100644 --- a/pkg/kubectl/cmd/apiresources/apiresources.go +++ b/pkg/kubectl/cmd/apiresources/apiresources.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" ) diff --git a/pkg/kubectl/cmd/apiresources/apiversions.go b/pkg/kubectl/cmd/apiresources/apiversions.go index 2eac871fb0..9a6b3c3e8a 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/apply/apply.go b/pkg/kubectl/cmd/apply/apply.go index e1ee8366ac..271b9f3e4b 100644 --- a/pkg/kubectl/cmd/apply/apply.go +++ b/pkg/kubectl/cmd/apply/apply.go @@ -46,11 +46,11 @@ import ( oapi "k8s.io/kube-openapi/pkg/util/proto" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/kubectl/validation" ) diff --git a/pkg/kubectl/cmd/apply/apply_edit_last_applied.go b/pkg/kubectl/cmd/apply/apply_edit_last_applied.go index fab66cdd16..0290a55e04 100644 --- a/pkg/kubectl/cmd/apply/apply_edit_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_edit_last_applied.go @@ -20,9 +20,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/apply/apply_set_last_applied.go b/pkg/kubectl/cmd/apply/apply_set_last_applied.go index ba41f1ed79..23699f407f 100644 --- a/pkg/kubectl/cmd/apply/apply_set_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_set_last_applied.go @@ -30,11 +30,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type SetLastAppliedOptions struct { diff --git a/pkg/kubectl/cmd/apply/apply_view_last_applied.go b/pkg/kubectl/cmd/apply/apply_view_last_applied.go index 96a0a8883c..ce4a7ff5f2 100644 --- a/pkg/kubectl/cmd/apply/apply_view_last_applied.go +++ b/pkg/kubectl/cmd/apply/apply_view_last_applied.go @@ -26,9 +26,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type ViewLastAppliedOptions struct { diff --git a/pkg/kubectl/cmd/attach/attach.go b/pkg/kubectl/cmd/attach/attach.go index a0ff396422..df5f24790d 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/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go index 8ed38fb7fd..31ce080dd1 100644 --- a/pkg/kubectl/cmd/auth/cani.go +++ b/pkg/kubectl/cmd/auth/cani.go @@ -30,8 +30,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/cli-runtime/pkg/genericclioptions" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // CanIOptions 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/auth/reconcile.go b/pkg/kubectl/cmd/auth/reconcile.go index d788c97355..089639705b 100644 --- a/pkg/kubectl/cmd/auth/reconcile.go +++ b/pkg/kubectl/cmd/auth/reconcile.go @@ -31,9 +31,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" rbacv1client "k8s.io/client-go/kubernetes/typed/rbac/v1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/registry/rbac/reconciliation" ) diff --git a/pkg/kubectl/cmd/autoscale/autoscale.go b/pkg/kubectl/cmd/autoscale/autoscale.go index f6dc07e71c..d609c98bbc 100644 --- a/pkg/kubectl/cmd/autoscale/autoscale.go +++ b/pkg/kubectl/cmd/autoscale/autoscale.go @@ -29,11 +29,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" autoscalingv1client "k8s.io/client-go/kubernetes/typed/autoscaling/v1" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/certificates/certificates.go b/pkg/kubectl/cmd/certificates/certificates.go index 5bb10861eb..058796fc8f 100644 --- a/pkg/kubectl/cmd/certificates/certificates.go +++ b/pkg/kubectl/cmd/certificates/certificates.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" certificatesv1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) func NewCmdCertificate(f cmdutil.Factory, ioStreams genericclioptions.IOStreams) *cobra.Command { diff --git a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go index a5488648fa..833c81936c 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo.go @@ -27,10 +27,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/resource" restclient "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" 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 ca313692f6..c79e2a972f 100644 --- a/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go +++ b/pkg/kubectl/cmd/clusterinfo/clusterinfo_dump.go @@ -31,11 +31,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/printers" appsv1client "k8s.io/client-go/kubernetes/typed/apps/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) const ( diff --git a/pkg/kubectl/cmd/cmd.go b/pkg/kubectl/cmd/cmd.go index fe20332c14..43a541ecc9 100644 --- a/pkg/kubectl/cmd/cmd.go +++ b/pkg/kubectl/cmd/cmd.go @@ -66,12 +66,12 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/scale" "k8s.io/kubernetes/pkg/kubectl/cmd/set" "k8s.io/kubernetes/pkg/kubectl/cmd/taint" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/cmd/top" 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/kubernetes/pkg/kubectl/util/templates" "k8s.io/cli-runtime/pkg/genericclioptions" ) diff --git a/pkg/kubectl/cmd/completion/completion.go b/pkg/kubectl/cmd/completion/completion.go index c6141f3b19..cd8fd36e0f 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) const defaultBoilerPlate = ` diff --git a/pkg/kubectl/cmd/config/config.go b/pkg/kubectl/cmd/config/config.go index f75ac8b6b4..4e1b63e623 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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 66d0115a2a..0dca066c1f 100644 --- a/pkg/kubectl/cmd/config/create_authinfo.go +++ b/pkg/kubectl/cmd/config/create_authinfo.go @@ -29,9 +29,9 @@ import ( "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type createAuthInfoOptions struct { diff --git a/pkg/kubectl/cmd/config/create_cluster.go b/pkg/kubectl/cmd/config/create_cluster.go index 310954e0ab..a07dfd6c77 100644 --- a/pkg/kubectl/cmd/config/create_cluster.go +++ b/pkg/kubectl/cmd/config/create_cluster.go @@ -28,9 +28,9 @@ import ( "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type createClusterOptions struct { diff --git a/pkg/kubectl/cmd/config/create_context.go b/pkg/kubectl/cmd/config/create_context.go index 631db47890..0a88a57950 100644 --- a/pkg/kubectl/cmd/config/create_context.go +++ b/pkg/kubectl/cmd/config/create_context.go @@ -26,9 +26,9 @@ import ( "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type createContextOptions struct { diff --git a/pkg/kubectl/cmd/config/current_context.go b/pkg/kubectl/cmd/config/current_context.go index da47c14af9..3751d8b25c 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type CurrentContextOptions struct { diff --git a/pkg/kubectl/cmd/config/delete_cluster.go b/pkg/kubectl/cmd/config/delete_cluster.go index bc3efe774f..9ae52e87c1 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/config/delete_context.go b/pkg/kubectl/cmd/config/delete_context.go index e7156b110c..76ae529fd7 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/config/get_clusters.go b/pkg/kubectl/cmd/config/get_clusters.go index c19450f241..bbaebf9e7a 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/config/get_contexts.go b/pkg/kubectl/cmd/config/get_contexts.go index c77915cdcc..533e726543 100644 --- a/pkg/kubectl/cmd/config/get_contexts.go +++ b/pkg/kubectl/cmd/config/get_contexts.go @@ -30,9 +30,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" ) diff --git a/pkg/kubectl/cmd/config/rename_context.go b/pkg/kubectl/cmd/config/rename_context.go index 506b917a46..535a811102 100644 --- a/pkg/kubectl/cmd/config/rename_context.go +++ b/pkg/kubectl/cmd/config/rename_context.go @@ -24,8 +24,8 @@ import ( "github.com/spf13/cobra" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // RenameContextOptions contains the options for running the rename-context cli command. diff --git a/pkg/kubectl/cmd/config/set.go b/pkg/kubectl/cmd/config/set.go index 40f39d79fa..9117402bba 100644 --- a/pkg/kubectl/cmd/config/set.go +++ b/pkg/kubectl/cmd/config/set.go @@ -28,9 +28,9 @@ import ( "k8s.io/apiserver/pkg/util/flag" "k8s.io/client-go/tools/clientcmd" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type setOptions struct { diff --git a/pkg/kubectl/cmd/config/unset.go b/pkg/kubectl/cmd/config/unset.go index 13cd8d8103..02a519cb42 100644 --- a/pkg/kubectl/cmd/config/unset.go +++ b/pkg/kubectl/cmd/config/unset.go @@ -23,7 +23,7 @@ import ( "reflect" "github.com/spf13/cobra" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/client-go/tools/clientcmd" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" diff --git a/pkg/kubectl/cmd/config/use_context.go b/pkg/kubectl/cmd/config/use_context.go index 6330394eed..b22251af26 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/config/view.go b/pkg/kubectl/cmd/config/view.go index bd1b1b7496..b285245890 100644 --- a/pkg/kubectl/cmd/config/view.go +++ b/pkg/kubectl/cmd/config/view.go @@ -26,10 +26,10 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "k8s.io/client-go/tools/clientcmd/api/latest" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" ) diff --git a/pkg/kubectl/cmd/convert/convert.go b/pkg/kubectl/cmd/convert/convert.go index 1e29060f45..251b15540e 100644 --- a/pkg/kubectl/cmd/convert/convert.go +++ b/pkg/kubectl/cmd/convert/convert.go @@ -30,9 +30,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" scheme "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/kubectl/validation" ) diff --git a/pkg/kubectl/cmd/cp/cp.go b/pkg/kubectl/cmd/cp/cp.go index bc804ceb5c..8b4817d674 100644 --- a/pkg/kubectl/cmd/cp/cp.go +++ b/pkg/kubectl/cmd/cp/cp.go @@ -31,9 +31,9 @@ import ( "k8s.io/client-go/kubernetes" restclient "k8s.io/client-go/rest" "k8s.io/kubernetes/pkg/kubectl/cmd/exec" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "bytes" diff --git a/pkg/kubectl/cmd/create/create.go b/pkg/kubectl/cmd/create/create.go index bfd5128250..d579aefadd 100644 --- a/pkg/kubectl/cmd/create/create.go +++ b/pkg/kubectl/cmd/create/create.go @@ -36,11 +36,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/client-go/dynamic" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" ) diff --git a/pkg/kubectl/cmd/create/create_clusterrole.go b/pkg/kubectl/cmd/create/create_clusterrole.go index 670b3d591b..ce17002827 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" utilflag "k8s.io/apiserver/pkg/util/flag" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_clusterrolebinding.go b/pkg/kubectl/cmd/create/create_clusterrolebinding.go index a2f77ca6ca..963bea796e 100644 --- a/pkg/kubectl/cmd/create/create_clusterrolebinding.go +++ b/pkg/kubectl/cmd/create/create_clusterrolebinding.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_configmap.go b/pkg/kubectl/cmd/create/create_configmap.go index a3485f33f7..46e5230ae2 100644 --- a/pkg/kubectl/cmd/create/create_configmap.go +++ b/pkg/kubectl/cmd/create/create_configmap.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_deployment.go b/pkg/kubectl/cmd/create/create_deployment.go index 65e2eeaf05..82bde7ba93 100644 --- a/pkg/kubectl/cmd/create/create_deployment.go +++ b/pkg/kubectl/cmd/create/create_deployment.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_job.go b/pkg/kubectl/cmd/create/create_job.go index b0665ee273..a82348e1b8 100644 --- a/pkg/kubectl/cmd/create/create_job.go +++ b/pkg/kubectl/cmd/create/create_job.go @@ -29,10 +29,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/resource" batchv1client "k8s.io/client-go/kubernetes/typed/batch/v1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_namespace.go b/pkg/kubectl/cmd/create/create_namespace.go index e5fdb89a7d..46409c703d 100644 --- a/pkg/kubectl/cmd/create/create_namespace.go +++ b/pkg/kubectl/cmd/create/create_namespace.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_pdb.go b/pkg/kubectl/cmd/create/create_pdb.go index b45f7f5d95..fbb283001c 100644 --- a/pkg/kubectl/cmd/create/create_pdb.go +++ b/pkg/kubectl/cmd/create/create_pdb.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_priorityclass.go b/pkg/kubectl/cmd/create/create_priorityclass.go index 6223c25b41..e51638c861 100644 --- a/pkg/kubectl/cmd/create/create_priorityclass.go +++ b/pkg/kubectl/cmd/create/create_priorityclass.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_quota.go b/pkg/kubectl/cmd/create/create_quota.go index 0162a0e2a7..9c43ed42e2 100644 --- a/pkg/kubectl/cmd/create/create_quota.go +++ b/pkg/kubectl/cmd/create/create_quota.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_role.go b/pkg/kubectl/cmd/create/create_role.go index 0d9a72eab8..7124c509e8 100644 --- a/pkg/kubectl/cmd/create/create_role.go +++ b/pkg/kubectl/cmd/create/create_role.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" clientgorbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_rolebinding.go b/pkg/kubectl/cmd/create/create_rolebinding.go index da5eada606..977e8f1930 100644 --- a/pkg/kubectl/cmd/create/create_rolebinding.go +++ b/pkg/kubectl/cmd/create/create_rolebinding.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/create/create_secret.go b/pkg/kubectl/cmd/create/create_secret.go index 7b68b82657..96fd3a30c9 100644 --- a/pkg/kubectl/cmd/create/create_secret.go +++ b/pkg/kubectl/cmd/create/create_secret.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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 5cae370ff8..4b31641fd0 100644 --- a/pkg/kubectl/cmd/create/create_service.go +++ b/pkg/kubectl/cmd/create/create_service.go @@ -22,9 +22,9 @@ import ( "k8s.io/api/core/v1" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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 e388c3ada9..dfec6680f1 100644 --- a/pkg/kubectl/cmd/create/create_serviceaccount.go +++ b/pkg/kubectl/cmd/create/create_serviceaccount.go @@ -21,9 +21,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/delete/delete.go b/pkg/kubectl/cmd/delete/delete.go index 0ddf8eaefa..7a0c60919d 100644 --- a/pkg/kubectl/cmd/delete/delete.go +++ b/pkg/kubectl/cmd/delete/delete.go @@ -32,10 +32,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/client-go/dynamic" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" kubectlwait "k8s.io/kubernetes/pkg/kubectl/cmd/wait" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/describe/describe.go b/pkg/kubectl/cmd/describe/describe.go index 0772ca0911..9b65fa794e 100644 --- a/pkg/kubectl/cmd/describe/describe.go +++ b/pkg/kubectl/cmd/describe/describe.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" ) diff --git a/pkg/kubectl/cmd/diff/diff.go b/pkg/kubectl/cmd/diff/diff.go index 5f1ffc0fa6..e8991ca3e8 100644 --- a/pkg/kubectl/cmd/diff/diff.go +++ b/pkg/kubectl/cmd/diff/diff.go @@ -35,11 +35,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/apply" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/drain/drain.go b/pkg/kubectl/cmd/drain/drain.go index 2fda6f8e3e..187b73c1dd 100644 --- a/pkg/kubectl/cmd/drain/drain.go +++ b/pkg/kubectl/cmd/drain/drain.go @@ -44,10 +44,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type DrainOptions struct { diff --git a/pkg/kubectl/cmd/edit/edit.go b/pkg/kubectl/cmd/edit/edit.go index 0e778f09e3..ab121f41ed 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/cmd/util/editor" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/exec/exec.go b/pkg/kubectl/cmd/exec/exec.go index 1c6bbb9e12..2cf2aa57bb 100644 --- a/pkg/kubectl/cmd/exec/exec.go +++ b/pkg/kubectl/cmd/exec/exec.go @@ -30,10 +30,10 @@ import ( coreclient "k8s.io/client-go/kubernetes/typed/core/v1" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/kubectl/util/term" "k8s.io/kubernetes/pkg/util/interrupt" ) diff --git a/pkg/kubectl/cmd/explain/explain.go b/pkg/kubectl/cmd/explain/explain.go index 4efecbeeee..73f6289fb4 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/kubernetes/pkg/kubectl/cmd/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" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/expose/expose.go b/pkg/kubectl/cmd/expose/expose.go index 51b0992ee0..0921ec6cd1 100644 --- a/pkg/kubectl/cmd/expose/expose.go +++ b/pkg/kubectl/cmd/expose/expose.go @@ -34,11 +34,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/client-go/dynamic" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/get/get.go b/pkg/kubectl/cmd/get/get.go index ee32152755..2739b3bc8c 100644 --- a/pkg/kubectl/cmd/get/get.go +++ b/pkg/kubectl/cmd/get/get.go @@ -43,9 +43,9 @@ import ( "k8s.io/kubernetes/pkg/api/legacyscheme" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/printers" "k8s.io/kubernetes/pkg/util/interrupt" ) diff --git a/pkg/kubectl/cmd/help/help.go b/pkg/kubectl/cmd/help/help.go index 7b530545e9..c26740b2c0 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/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var helpLong = templates.LongDesc(i18n.T(` diff --git a/pkg/kubectl/cmd/label/label.go b/pkg/kubectl/cmd/label/label.go index 948f552c32..ae512805ae 100644 --- a/pkg/kubectl/cmd/label/label.go +++ b/pkg/kubectl/cmd/label/label.go @@ -37,10 +37,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // LabelOptions have the data required to perform the label operation diff --git a/pkg/kubectl/cmd/logs/logs.go b/pkg/kubectl/cmd/logs/logs.go index dd5cc889e6..8ba240a950 100644 --- a/pkg/kubectl/cmd/logs/logs.go +++ b/pkg/kubectl/cmd/logs/logs.go @@ -30,12 +30,12 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) const ( diff --git a/pkg/kubectl/cmd/options/options.go b/pkg/kubectl/cmd/options/options.go index dc9ab09f43..2b24f2140f 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/kubernetes/pkg/kubectl/cmd/templates" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "github.com/spf13/cobra" ) diff --git a/pkg/kubectl/cmd/patch/patch.go b/pkg/kubectl/cmd/patch/patch.go index aee94c40a1..37eb4f51c6 100644 --- a/pkg/kubectl/cmd/patch/patch.go +++ b/pkg/kubectl/cmd/patch/patch.go @@ -36,10 +36,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var patchTypes = map[string]types.PatchType{"json": types.JSONPatchType, "merge": types.MergePatchType, "strategic": types.StrategicMergePatchType} diff --git a/pkg/kubectl/cmd/plugin/plugin.go b/pkg/kubectl/cmd/plugin/plugin.go index 582c35f07e..71b11d697e 100644 --- a/pkg/kubectl/cmd/plugin/plugin.go +++ b/pkg/kubectl/cmd/plugin/plugin.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/portforward/portforward.go b/pkg/kubectl/cmd/portforward/portforward.go index af03b46ef2..4194f4f336 100644 --- a/pkg/kubectl/cmd/portforward/portforward.go +++ b/pkg/kubectl/cmd/portforward/portforward.go @@ -36,11 +36,11 @@ import ( restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/portforward" "k8s.io/client-go/transport/spdy" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // PortForwardOptions contains all the options for running the port-forward cli command. diff --git a/pkg/kubectl/cmd/proxy/proxy.go b/pkg/kubectl/cmd/proxy/proxy.go index ae29e9e40a..6701960675 100644 --- a/pkg/kubectl/cmd/proxy/proxy.go +++ b/pkg/kubectl/cmd/proxy/proxy.go @@ -27,10 +27,10 @@ import ( "github.com/golang/glog" "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/proxy" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/replace/replace.go b/pkg/kubectl/cmd/replace/replace.go index 0d274e8f61..1a72fd6a08 100644 --- a/pkg/kubectl/cmd/replace/replace.go +++ b/pkg/kubectl/cmd/replace/replace.go @@ -34,10 +34,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl/cmd/delete" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/kubectl/validation" ) diff --git a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go index 766a5ab4b8..2ed243f0cd 100644 --- a/pkg/kubectl/cmd/rollingupdate/rollingupdate.go +++ b/pkg/kubectl/cmd/rollingupdate/rollingupdate.go @@ -36,11 +36,11 @@ import ( "k8s.io/client-go/kubernetes" scaleclient "k8s.io/client-go/scale" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/kubectl/validation" ) diff --git a/pkg/kubectl/cmd/rollout/rollout.go b/pkg/kubectl/cmd/rollout/rollout.go index f0eb548ce0..38b2c52975 100644 --- a/pkg/kubectl/cmd/rollout/rollout.go +++ b/pkg/kubectl/cmd/rollout/rollout.go @@ -21,9 +21,9 @@ import ( "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_history.go b/pkg/kubectl/cmd/rollout/rollout_history.go index 4f49afbd8f..0fbe08cced 100644 --- a/pkg/kubectl/cmd/rollout/rollout_history.go +++ b/pkg/kubectl/cmd/rollout/rollout_history.go @@ -24,11 +24,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/rollout/rollout_pause.go b/pkg/kubectl/cmd/rollout/rollout_pause.go index e87e9c7871..0cb82a5d61 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/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl/cmd/set" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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_resume.go b/pkg/kubectl/cmd/rollout/rollout_resume.go index 4ed7309aa6..8626d8ec15 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/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl/cmd/set" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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 828e03cb9f..311c9c88d9 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/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/util/interrupt" ) diff --git a/pkg/kubectl/cmd/rollout/rollout_undo.go b/pkg/kubectl/cmd/rollout/rollout_undo.go index 3dd2971264..690a7d340b 100644 --- a/pkg/kubectl/cmd/rollout/rollout_undo.go +++ b/pkg/kubectl/cmd/rollout/rollout_undo.go @@ -25,10 +25,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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/run.go b/pkg/kubectl/cmd/run/run.go index da130da25b..7ed5cab8e9 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -43,11 +43,11 @@ import ( "k8s.io/kubernetes/pkg/kubectl/cmd/delete" "k8s.io/kubernetes/pkg/kubectl/cmd/exec" "k8s.io/kubernetes/pkg/kubectl/cmd/logs" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/util/interrupt" uexec "k8s.io/utils/exec" ) diff --git a/pkg/kubectl/cmd/scale/scale.go b/pkg/kubectl/cmd/scale/scale.go index 540f4e7822..1144e30756 100644 --- a/pkg/kubectl/cmd/scale/scale.go +++ b/pkg/kubectl/cmd/scale/scale.go @@ -32,9 +32,9 @@ import ( "k8s.io/client-go/kubernetes" batchclient "k8s.io/client-go/kubernetes/typed/batch/v1" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/set/set.go b/pkg/kubectl/cmd/set/set.go index de6ff5bc68..a50b7f9537 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/set/set_env.go b/pkg/kubectl/cmd/set/set_env.go index 2bd4b340a1..62aed433df 100644 --- a/pkg/kubectl/cmd/set/set_env.go +++ b/pkg/kubectl/cmd/set/set_env.go @@ -35,10 +35,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/client-go/kubernetes" envutil "k8s.io/kubernetes/pkg/kubectl/cmd/set/env" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/set/set_image.go b/pkg/kubectl/cmd/set/set_image.go index a09b9912cf..3a18f36bec 100644 --- a/pkg/kubectl/cmd/set/set_image.go +++ b/pkg/kubectl/cmd/set/set_image.go @@ -29,11 +29,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // 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 5d5d944015..ee2eb12c73 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/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/kubernetes/pkg/kubectl" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/set/set_selector.go b/pkg/kubectl/cmd/set/set_selector.go index 6613f24bda..9babe08a2a 100644 --- a/pkg/kubectl/cmd/set/set_selector.go +++ b/pkg/kubectl/cmd/set/set_selector.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // SelectorOptions 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 612ef8af34..45b0ae3057 100644 --- a/pkg/kubectl/cmd/set/set_serviceaccount.go +++ b/pkg/kubectl/cmd/set/set_serviceaccount.go @@ -30,11 +30,11 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/polymorphichelpers" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/set/set_subject.go b/pkg/kubectl/cmd/set/set_subject.go index 74c8963615..a4a245e285 100644 --- a/pkg/kubectl/cmd/set/set_subject.go +++ b/pkg/kubectl/cmd/set/set_subject.go @@ -30,10 +30,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/taint/taint.go b/pkg/kubectl/cmd/taint/taint.go index 7646b7da9a..a094f1db31 100644 --- a/pkg/kubectl/cmd/taint/taint.go +++ b/pkg/kubectl/cmd/taint/taint.go @@ -33,10 +33,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/cli-runtime/pkg/genericclioptions/printers" "k8s.io/cli-runtime/pkg/genericclioptions/resource" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/scheme" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" taintutils "k8s.io/kubernetes/pkg/util/taints" ) diff --git a/pkg/kubectl/cmd/top/top.go b/pkg/kubectl/cmd/top/top.go index a1830b9bd7..27e6e725ae 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" 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 01ac151d16..8250c099d0 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" 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 1e93be1c09..8ffccc1b4c 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/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/metricsutil" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" 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/util/printing.go b/pkg/kubectl/cmd/util/printing.go index dab4792c1e..75b73c6204 100644 --- a/pkg/kubectl/cmd/util/printing.go +++ b/pkg/kubectl/cmd/util/printing.go @@ -19,7 +19,7 @@ package util import ( "fmt" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) // SuggestApiResources returns a suggestion to use the "api-resources" command diff --git a/pkg/kubectl/cmd/util/sanity/cmd_sanity.go b/pkg/kubectl/cmd/util/sanity/cmd_sanity.go index 241f855b8b..21d2a291d2 100644 --- a/pkg/kubectl/cmd/util/sanity/cmd_sanity.go +++ b/pkg/kubectl/cmd/util/sanity/cmd_sanity.go @@ -24,7 +24,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/pflag" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" + + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) type CmdCheck func(cmd *cobra.Command) []error diff --git a/pkg/kubectl/cmd/version/version.go b/pkg/kubectl/cmd/version/version.go index 8581b1c1c4..8682063ead 100644 --- a/pkg/kubectl/cmd/version/version.go +++ b/pkg/kubectl/cmd/version/version.go @@ -27,9 +27,9 @@ import ( apimachineryversion "k8s.io/apimachinery/pkg/version" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" "k8s.io/kubernetes/pkg/kubectl/util/i18n" + "k8s.io/kubernetes/pkg/kubectl/util/templates" "k8s.io/kubernetes/pkg/version" ) diff --git a/pkg/kubectl/cmd/wait/wait.go b/pkg/kubectl/cmd/wait/wait.go index 63bac24246..c8f6bfb438 100644 --- a/pkg/kubectl/cmd/wait/wait.go +++ b/pkg/kubectl/cmd/wait/wait.go @@ -38,8 +38,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions/resource" "k8s.io/client-go/dynamic" watchtools "k8s.io/client-go/tools/watch" - "k8s.io/kubernetes/pkg/kubectl/cmd/templates" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" + "k8s.io/kubernetes/pkg/kubectl/util/templates" ) var ( diff --git a/pkg/kubectl/cmd/templates/BUILD b/pkg/kubectl/util/templates/BUILD similarity index 100% rename from pkg/kubectl/cmd/templates/BUILD rename to pkg/kubectl/util/templates/BUILD diff --git a/pkg/kubectl/cmd/templates/command_groups.go b/pkg/kubectl/util/templates/command_groups.go similarity index 100% rename from pkg/kubectl/cmd/templates/command_groups.go rename to pkg/kubectl/util/templates/command_groups.go diff --git a/pkg/kubectl/cmd/templates/markdown.go b/pkg/kubectl/util/templates/markdown.go similarity index 100% rename from pkg/kubectl/cmd/templates/markdown.go rename to pkg/kubectl/util/templates/markdown.go diff --git a/pkg/kubectl/cmd/templates/normalizers.go b/pkg/kubectl/util/templates/normalizers.go similarity index 100% rename from pkg/kubectl/cmd/templates/normalizers.go rename to pkg/kubectl/util/templates/normalizers.go diff --git a/pkg/kubectl/cmd/templates/templater.go b/pkg/kubectl/util/templates/templater.go similarity index 100% rename from pkg/kubectl/cmd/templates/templater.go rename to pkg/kubectl/util/templates/templater.go diff --git a/pkg/kubectl/cmd/templates/templates.go b/pkg/kubectl/util/templates/templates.go similarity index 100% rename from pkg/kubectl/cmd/templates/templates.go rename to pkg/kubectl/util/templates/templates.go From 61899e16540d36f61e6ef70f714b31c8181c7613 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 10 Oct 2018 20:42:22 +0200 Subject: [PATCH 2/3] Generated changes --- pkg/kubectl/cmd/BUILD | 3 +-- pkg/kubectl/cmd/annotate/BUILD | 2 +- pkg/kubectl/cmd/apiresources/BUILD | 2 +- pkg/kubectl/cmd/apply/BUILD | 2 +- pkg/kubectl/cmd/attach/BUILD | 2 +- pkg/kubectl/cmd/auth/BUILD | 2 +- pkg/kubectl/cmd/autoscale/BUILD | 2 +- pkg/kubectl/cmd/certificates/BUILD | 2 +- pkg/kubectl/cmd/clusterinfo/BUILD | 2 +- pkg/kubectl/cmd/completion/BUILD | 2 +- pkg/kubectl/cmd/config/BUILD | 2 +- pkg/kubectl/cmd/convert/BUILD | 2 +- pkg/kubectl/cmd/cp/BUILD | 2 +- pkg/kubectl/cmd/create/BUILD | 2 +- pkg/kubectl/cmd/delete/BUILD | 2 +- pkg/kubectl/cmd/describe/BUILD | 2 +- pkg/kubectl/cmd/diff/BUILD | 2 +- pkg/kubectl/cmd/drain/BUILD | 2 +- pkg/kubectl/cmd/edit/BUILD | 2 +- pkg/kubectl/cmd/exec/BUILD | 2 +- pkg/kubectl/cmd/explain/BUILD | 2 +- pkg/kubectl/cmd/expose/BUILD | 2 +- pkg/kubectl/cmd/get/BUILD | 2 +- pkg/kubectl/cmd/help/BUILD | 2 +- pkg/kubectl/cmd/label/BUILD | 2 +- pkg/kubectl/cmd/logs/BUILD | 2 +- pkg/kubectl/cmd/options/BUILD | 2 +- pkg/kubectl/cmd/patch/BUILD | 2 +- pkg/kubectl/cmd/plugin/BUILD | 2 +- pkg/kubectl/cmd/portforward/BUILD | 2 +- pkg/kubectl/cmd/proxy/BUILD | 2 +- pkg/kubectl/cmd/replace/BUILD | 2 +- pkg/kubectl/cmd/rollingupdate/BUILD | 2 +- pkg/kubectl/cmd/rollout/BUILD | 2 +- pkg/kubectl/cmd/run/BUILD | 2 +- pkg/kubectl/cmd/scale/BUILD | 2 +- pkg/kubectl/cmd/set/BUILD | 2 +- pkg/kubectl/cmd/taint/BUILD | 2 +- pkg/kubectl/cmd/top/BUILD | 2 +- pkg/kubectl/cmd/util/BUILD | 2 +- pkg/kubectl/cmd/util/sanity/BUILD | 2 +- pkg/kubectl/cmd/version/BUILD | 2 +- pkg/kubectl/cmd/wait/BUILD | 2 +- pkg/kubectl/util/BUILD | 1 + pkg/kubectl/util/templates/BUILD | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/pkg/kubectl/cmd/BUILD b/pkg/kubectl/cmd/BUILD index 23997cb116..b3c2b79a4a 100644 --- a/pkg/kubectl/cmd/BUILD +++ b/pkg/kubectl/cmd/BUILD @@ -52,12 +52,12 @@ go_library( "//pkg/kubectl/cmd/scale:go_default_library", "//pkg/kubectl/cmd/set:go_default_library", "//pkg/kubectl/cmd/taint:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/top:go_default_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", + "//pkg/kubectl/util/templates:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/flag: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", @@ -140,7 +140,6 @@ filegroup( "//pkg/kubectl/cmd/scale:all-srcs", "//pkg/kubectl/cmd/set:all-srcs", "//pkg/kubectl/cmd/taint:all-srcs", - "//pkg/kubectl/cmd/templates:all-srcs", "//pkg/kubectl/cmd/testing:all-srcs", "//pkg/kubectl/cmd/top:all-srcs", "//pkg/kubectl/cmd/util:all-srcs", diff --git a/pkg/kubectl/cmd/annotate/BUILD b/pkg/kubectl/cmd/annotate/BUILD index c1e273ca70..97cbb1f00e 100644 --- a/pkg/kubectl/cmd/annotate/BUILD +++ b/pkg/kubectl/cmd/annotate/BUILD @@ -7,10 +7,10 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/apiresources/BUILD b/pkg/kubectl/cmd/apiresources/BUILD index 5ab39896be..069c81d503 100644 --- a/pkg/kubectl/cmd/apiresources/BUILD +++ b/pkg/kubectl/cmd/apiresources/BUILD @@ -9,9 +9,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/printers: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", diff --git a/pkg/kubectl/cmd/apply/BUILD b/pkg/kubectl/cmd/apply/BUILD index a29c7e77e0..ee2740165f 100644 --- a/pkg/kubectl/cmd/apply/BUILD +++ b/pkg/kubectl/cmd/apply/BUILD @@ -13,12 +13,12 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_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/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/kubectl/cmd/attach/BUILD b/pkg/kubectl/cmd/attach/BUILD index 7fdfbb62a7..dde0b4da10 100644 --- a/pkg/kubectl/cmd/attach/BUILD +++ b/pkg/kubectl/cmd/attach/BUILD @@ -7,11 +7,11 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index 1a95b739ae..756d269206 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/pkg/kubectl/cmd/auth/BUILD @@ -16,9 +16,9 @@ go_library( "//build/visible_to:pkg_kubectl_cmd_auth_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/registry/rbac/reconciliation:go_default_library", "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/api/rbac/v1:go_default_library", diff --git a/pkg/kubectl/cmd/autoscale/BUILD b/pkg/kubectl/cmd/autoscale/BUILD index 284a7371a4..c601d795d4 100644 --- a/pkg/kubectl/cmd/autoscale/BUILD +++ b/pkg/kubectl/cmd/autoscale/BUILD @@ -7,11 +7,11 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/certificates/BUILD b/pkg/kubectl/cmd/certificates/BUILD index 80db3ce37d..75c6f694fb 100644 --- a/pkg/kubectl/cmd/certificates/BUILD +++ b/pkg/kubectl/cmd/certificates/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/certificates", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/clusterinfo/BUILD b/pkg/kubectl/cmd/clusterinfo/BUILD index 148ce66bd0..0c5fe588f2 100644 --- a/pkg/kubectl/cmd/clusterinfo/BUILD +++ b/pkg/kubectl/cmd/clusterinfo/BUILD @@ -9,11 +9,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/clusterinfo", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/completion/BUILD b/pkg/kubectl/cmd/completion/BUILD index 52b2dbe3d1..fa7931d77f 100644 --- a/pkg/kubectl/cmd/completion/BUILD +++ b/pkg/kubectl/cmd/completion/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/completion", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/config/BUILD b/pkg/kubectl/cmd/config/BUILD index 1a3acfdc17..35655bdb51 100644 --- a/pkg/kubectl/cmd/config/BUILD +++ b/pkg/kubectl/cmd/config/BUILD @@ -28,10 +28,10 @@ go_library( "//build/visible_to:pkg_kubectl_cmd_config_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/printers: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", diff --git a/pkg/kubectl/cmd/convert/BUILD b/pkg/kubectl/cmd/convert/BUILD index af9795c11f..493542234f 100644 --- a/pkg/kubectl/cmd/convert/BUILD +++ b/pkg/kubectl/cmd/convert/BUILD @@ -8,9 +8,9 @@ go_library( deps = [ "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/validation: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", diff --git a/pkg/kubectl/cmd/cp/BUILD b/pkg/kubectl/cmd/cp/BUILD index e28178b191..ffa5a2ccfb 100644 --- a/pkg/kubectl/cmd/cp/BUILD +++ b/pkg/kubectl/cmd/cp/BUILD @@ -7,9 +7,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl/cmd/exec:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/create/BUILD b/pkg/kubectl/cmd/create/BUILD index ceedd7363c..e7c4de90af 100644 --- a/pkg/kubectl/cmd/create/BUILD +++ b/pkg/kubectl/cmd/create/BUILD @@ -23,11 +23,11 @@ go_library( visibility = ["//build/visible_to:pkg_kubectl_cmd_create_CONSUMERS"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/editor:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/printers:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1beta1:go_default_library", diff --git a/pkg/kubectl/cmd/delete/BUILD b/pkg/kubectl/cmd/delete/BUILD index e0e0cad7c9..1768dad67a 100644 --- a/pkg/kubectl/cmd/delete/BUILD +++ b/pkg/kubectl/cmd/delete/BUILD @@ -9,10 +9,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/delete", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/wait:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/describe/BUILD b/pkg/kubectl/cmd/describe/BUILD index 849fc5e2a5..fbd5177413 100644 --- a/pkg/kubectl/cmd/describe/BUILD +++ b/pkg/kubectl/cmd/describe/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/describe", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/printers: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", diff --git a/pkg/kubectl/cmd/diff/BUILD b/pkg/kubectl/cmd/diff/BUILD index 8cc0552e4e..a1eaca378c 100644 --- a/pkg/kubectl/cmd/diff/BUILD +++ b/pkg/kubectl/cmd/diff/BUILD @@ -8,11 +8,11 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/apply:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", diff --git a/pkg/kubectl/cmd/drain/BUILD b/pkg/kubectl/cmd/drain/BUILD index e75651aa53..d90246eb87 100644 --- a/pkg/kubectl/cmd/drain/BUILD +++ b/pkg/kubectl/cmd/drain/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/drain", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/kubectl/cmd/edit/BUILD b/pkg/kubectl/cmd/edit/BUILD index a8c9de0cd5..424e441d54 100644 --- a/pkg/kubectl/cmd/edit/BUILD +++ b/pkg/kubectl/cmd/edit/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/edit", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/editor:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/pkg/kubectl/cmd/exec/BUILD b/pkg/kubectl/cmd/exec/BUILD index 3958762de4..00411d528f 100644 --- a/pkg/kubectl/cmd/exec/BUILD +++ b/pkg/kubectl/cmd/exec/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/exec", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/util/term:go_default_library", "//pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/pkg/kubectl/cmd/explain/BUILD b/pkg/kubectl/cmd/explain/BUILD index 153b373967..6aaa319dca 100644 --- a/pkg/kubectl/cmd/explain/BUILD +++ b/pkg/kubectl/cmd/explain/BUILD @@ -6,11 +6,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/explain", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_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", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/expose/BUILD b/pkg/kubectl/cmd/expose/BUILD index b2f0cb362e..4b191792d5 100644 --- a/pkg/kubectl/cmd/expose/BUILD +++ b/pkg/kubectl/cmd/expose/BUILD @@ -7,11 +7,11 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 36092f1353..a14665b829 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -27,11 +27,11 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/apis/core:go_default_library", "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", "//pkg/util/interrupt:go_default_library", diff --git a/pkg/kubectl/cmd/help/BUILD b/pkg/kubectl/cmd/help/BUILD index 5c14d0aa49..32a36b7ee5 100644 --- a/pkg/kubectl/cmd/help/BUILD +++ b/pkg/kubectl/cmd/help/BUILD @@ -6,8 +6,8 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/help", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/label/BUILD b/pkg/kubectl/cmd/label/BUILD index 83fb5493c1..7e9abb28d4 100644 --- a/pkg/kubectl/cmd/label/BUILD +++ b/pkg/kubectl/cmd/label/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/label", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/logs/BUILD b/pkg/kubectl/cmd/logs/BUILD index 5e5c111265..3c4dcd9781 100644 --- a/pkg/kubectl/cmd/logs/BUILD +++ b/pkg/kubectl/cmd/logs/BUILD @@ -6,12 +6,12 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/logs", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/options/BUILD b/pkg/kubectl/cmd/options/BUILD index 03bf0d3650..8c2632bce4 100644 --- a/pkg/kubectl/cmd/options/BUILD +++ b/pkg/kubectl/cmd/options/BUILD @@ -6,8 +6,8 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/options", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/patch/BUILD b/pkg/kubectl/cmd/patch/BUILD index 7019975e1f..ef65d083b9 100644 --- a/pkg/kubectl/cmd/patch/BUILD +++ b/pkg/kubectl/cmd/patch/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/patch", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/plugin/BUILD b/pkg/kubectl/cmd/plugin/BUILD index 6f4a157e5d..88174ca29a 100644 --- a/pkg/kubectl/cmd/plugin/BUILD +++ b/pkg/kubectl/cmd/plugin/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/plugin", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/portforward/BUILD b/pkg/kubectl/cmd/portforward/BUILD index 1cefcb85c9..cb13eb73a4 100644 --- a/pkg/kubectl/cmd/portforward/BUILD +++ b/pkg/kubectl/cmd/portforward/BUILD @@ -6,11 +6,11 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/portforward", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/proxy/BUILD b/pkg/kubectl/cmd/proxy/BUILD index 7632354b9b..3edb46af21 100644 --- a/pkg/kubectl/cmd/proxy/BUILD +++ b/pkg/kubectl/cmd/proxy/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/proxy", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/proxy:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", "//vendor/github.com/golang/glog:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/replace/BUILD b/pkg/kubectl/cmd/replace/BUILD index 29b0d9d6bd..6e58729442 100644 --- a/pkg/kubectl/cmd/replace/BUILD +++ b/pkg/kubectl/cmd/replace/BUILD @@ -8,10 +8,10 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/delete:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/pkg/kubectl/cmd/rollingupdate/BUILD b/pkg/kubectl/cmd/rollingupdate/BUILD index 68d57ca4d5..ea784dc334 100644 --- a/pkg/kubectl/cmd/rollingupdate/BUILD +++ b/pkg/kubectl/cmd/rollingupdate/BUILD @@ -7,11 +7,11 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/validation:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/kubectl/cmd/rollout/BUILD b/pkg/kubectl/cmd/rollout/BUILD index 9b3938f713..8f7c389c0d 100644 --- a/pkg/kubectl/cmd/rollout/BUILD +++ b/pkg/kubectl/cmd/rollout/BUILD @@ -21,11 +21,11 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/set:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/util/interrupt: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", diff --git a/pkg/kubectl/cmd/run/BUILD b/pkg/kubectl/cmd/run/BUILD index 04fd665ca6..f255879209 100644 --- a/pkg/kubectl/cmd/run/BUILD +++ b/pkg/kubectl/cmd/run/BUILD @@ -11,11 +11,11 @@ go_library( "//pkg/kubectl/cmd/delete:go_default_library", "//pkg/kubectl/cmd/exec:go_default_library", "//pkg/kubectl/cmd/logs:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/pkg/kubectl/cmd/scale/BUILD b/pkg/kubectl/cmd/scale/BUILD index 4ee8c71b8c..1c30a32274 100644 --- a/pkg/kubectl/cmd/scale/BUILD +++ b/pkg/kubectl/cmd/scale/BUILD @@ -10,9 +10,9 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//staging/src/k8s.io/api/batch/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", diff --git a/pkg/kubectl/cmd/set/BUILD b/pkg/kubectl/cmd/set/BUILD index 6450cbe4b8..e03f1efe5f 100644 --- a/pkg/kubectl/cmd/set/BUILD +++ b/pkg/kubectl/cmd/set/BUILD @@ -21,11 +21,11 @@ go_library( deps = [ "//pkg/kubectl:go_default_library", "//pkg/kubectl/cmd/set/env:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/polymorphichelpers:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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/errors:go_default_library", diff --git a/pkg/kubectl/cmd/taint/BUILD b/pkg/kubectl/cmd/taint/BUILD index d716caa1c9..a4abc94e27 100644 --- a/pkg/kubectl/cmd/taint/BUILD +++ b/pkg/kubectl/cmd/taint/BUILD @@ -6,10 +6,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/taint", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/scheme:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/util/taints:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/pkg/kubectl/cmd/top/BUILD b/pkg/kubectl/cmd/top/BUILD index 6a05851acf..2a879a973b 100644 --- a/pkg/kubectl/cmd/top/BUILD +++ b/pkg/kubectl/cmd/top/BUILD @@ -10,10 +10,10 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/top", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/metricsutil:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates: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", diff --git a/pkg/kubectl/cmd/util/BUILD b/pkg/kubectl/cmd/util/BUILD index 124d14148a..cba29a34e6 100644 --- a/pkg/kubectl/cmd/util/BUILD +++ b/pkg/kubectl/cmd/util/BUILD @@ -17,9 +17,9 @@ go_library( "//pkg/api/legacyscheme:go_default_library", "//pkg/client/clientset_generated/internalclientset:go_default_library", "//pkg/kubectl:go_default_library", - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util/openapi:go_default_library", "//pkg/kubectl/cmd/util/openapi/validation:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/kubectl/validation:go_default_library", "//pkg/printers:go_default_library", "//pkg/printers/internalversion:go_default_library", diff --git a/pkg/kubectl/cmd/util/sanity/BUILD b/pkg/kubectl/cmd/util/sanity/BUILD index 986624be73..a2c90dda53 100644 --- a/pkg/kubectl/cmd/util/sanity/BUILD +++ b/pkg/kubectl/cmd/util/sanity/BUILD @@ -11,7 +11,7 @@ go_library( "//build/visible_to:pkg_kubectl_cmd_util_sanity_CONSUMERS", ], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", + "//pkg/kubectl/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/version/BUILD b/pkg/kubectl/cmd/version/BUILD index 76832d57df..64c3e56952 100644 --- a/pkg/kubectl/cmd/version/BUILD +++ b/pkg/kubectl/cmd/version/BUILD @@ -6,9 +6,9 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/version", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", "//pkg/kubectl/util/i18n:go_default_library", + "//pkg/kubectl/util/templates:go_default_library", "//pkg/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", diff --git a/pkg/kubectl/cmd/wait/BUILD b/pkg/kubectl/cmd/wait/BUILD index 42427e28b5..3fb1238067 100644 --- a/pkg/kubectl/cmd/wait/BUILD +++ b/pkg/kubectl/cmd/wait/BUILD @@ -6,8 +6,8 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/wait", visibility = ["//visibility:public"], deps = [ - "//pkg/kubectl/cmd/templates:go_default_library", "//pkg/kubectl/cmd/util:go_default_library", + "//pkg/kubectl/util/templates: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", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD index 794e6e8a7d..0799144faa 100644 --- a/pkg/kubectl/util/BUILD +++ b/pkg/kubectl/util/BUILD @@ -70,6 +70,7 @@ filegroup( "//pkg/kubectl/util/i18n:all-srcs", "//pkg/kubectl/util/logs:all-srcs", "//pkg/kubectl/util/slice:all-srcs", + "//pkg/kubectl/util/templates:all-srcs", "//pkg/kubectl/util/term:all-srcs", ], tags = ["automanaged"], diff --git a/pkg/kubectl/util/templates/BUILD b/pkg/kubectl/util/templates/BUILD index 11e3615799..e31ef11654 100644 --- a/pkg/kubectl/util/templates/BUILD +++ b/pkg/kubectl/util/templates/BUILD @@ -12,7 +12,7 @@ go_library( "templater.go", "templates.go", ], - importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/templates", + importpath = "k8s.io/kubernetes/pkg/kubectl/util/templates", visibility = [ "//build/visible_to:pkg_kubectl_cmd_templates_CONSUMERS", ], From e0c9189082fdb50d4deb4da665a164cb8d659776 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 10 Oct 2018 20:51:40 +0200 Subject: [PATCH 3/3] Manual changes to package visibility --- build/visible_to/BUILD | 4 ++-- pkg/kubectl/util/templates/BUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD index 5e3fc9ad02..9ef8af95a7 100644 --- a/build/visible_to/BUILD +++ b/build/visible_to/BUILD @@ -161,7 +161,7 @@ package_group( ) package_group( - name = "pkg_kubectl_cmd_templates_CONSUMERS", + name = "pkg_kubectl_util_templates_CONSUMERS", includes = [ ":COMMON_generators", ":COMMON_testing", @@ -207,12 +207,12 @@ package_group( "//pkg/kubectl/cmd/scale", "//pkg/kubectl/cmd/set", "//pkg/kubectl/cmd/taint", - "//pkg/kubectl/cmd/templates", "//pkg/kubectl/cmd/top", "//pkg/kubectl/cmd/util", "//pkg/kubectl/cmd/util/sanity", "//pkg/kubectl/cmd/version", "//pkg/kubectl/cmd/wait", + "//pkg/kubectl/util", ], ) diff --git a/pkg/kubectl/util/templates/BUILD b/pkg/kubectl/util/templates/BUILD index e31ef11654..d72a5abcb1 100644 --- a/pkg/kubectl/util/templates/BUILD +++ b/pkg/kubectl/util/templates/BUILD @@ -14,7 +14,7 @@ go_library( ], importpath = "k8s.io/kubernetes/pkg/kubectl/util/templates", visibility = [ - "//build/visible_to:pkg_kubectl_cmd_templates_CONSUMERS", + "//build/visible_to:pkg_kubectl_util_templates_CONSUMERS", ], deps = [ "//pkg/kubectl/util/term:go_default_library", @@ -36,6 +36,6 @@ filegroup( srcs = [":package-srcs"], tags = ["automanaged"], visibility = [ - "//build/visible_to:pkg_kubectl_cmd_templates_CONSUMERS", + "//build/visible_to:pkg_kubectl_util_templates_CONSUMERS", ], )