From 8b2130343e71458cf312f99a2a2e09f65b7549d4 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 13:22:46 -0700 Subject: [PATCH 1/5] Moves tableprinter.go and tabwriter.go to cli-runtime/pkg/printers. Copies PrintOptions to cli-runtime/pkg/printers. --- pkg/kubectl/cmd/get/BUILD | 1 - pkg/kubectl/cmd/get/get.go | 5 ++-- pkg/kubectl/cmd/get/humanreadable_flags.go | 2 +- pkg/printers/BUILD | 26 +------------------ pkg/printers/interface.go | 17 ------------ .../src/k8s.io/cli-runtime/pkg/printers/BUILD | 10 +++++++ .../cli-runtime/pkg/printers/interface.go | 17 ++++++++++++ .../cli-runtime/pkg}/printers/tableprinter.go | 0 .../pkg}/printers/tableprinter_test.go | 0 .../cli-runtime/pkg}/printers/tabwriter.go | 0 10 files changed, 31 insertions(+), 47 deletions(-) rename {pkg => staging/src/k8s.io/cli-runtime/pkg}/printers/tableprinter.go (100%) rename {pkg => staging/src/k8s.io/cli-runtime/pkg}/printers/tableprinter_test.go (100%) rename {pkg => staging/src/k8s.io/cli-runtime/pkg}/printers/tabwriter.go (100%) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 80f39d71715..43d27778bb0 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -29,7 +29,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/get", visibility = ["//visibility:public"], deps = [ - "//pkg/printers:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/pkg/kubectl/cmd/get/get.go b/pkg/kubectl/cmd/get/get.go index 40cfacb8827..73bf54404f9 100644 --- a/pkg/kubectl/cmd/get/get.go +++ b/pkg/kubectl/cmd/get/get.go @@ -45,7 +45,6 @@ import ( "k8s.io/kubectl/pkg/rawhttp" "k8s.io/kubectl/pkg/util/i18n" "k8s.io/kubectl/pkg/util/interrupt" - utilprinters "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" utilpointer "k8s.io/utils/pointer" ) @@ -523,7 +522,7 @@ func (o *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []string) e // output an empty line separating output separatorWriter := &separatorWriterWrapper{Delegate: trackingWriter} - w := utilprinters.GetNewTabWriter(separatorWriter) + w := printers.GetNewTabWriter(separatorWriter) for ix := range objs { var mapping *meta.RESTMapping var info *resource.Info @@ -670,7 +669,7 @@ func (o *GetOptions) watch(f cmdutil.Factory, cmd *cobra.Command, args []string) } } - writer := utilprinters.GetNewTabWriter(o.Out) + writer := printers.GetNewTabWriter(o.Out) // print the current object var objsToPrint []runtime.Object diff --git a/pkg/kubectl/cmd/get/humanreadable_flags.go b/pkg/kubectl/cmd/get/humanreadable_flags.go index 7eb73530862..5fcf34d8cc0 100644 --- a/pkg/kubectl/cmd/get/humanreadable_flags.go +++ b/pkg/kubectl/cmd/get/humanreadable_flags.go @@ -21,7 +21,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/kubernetes/pkg/printers" + "k8s.io/cli-runtime/pkg/printers" ) // HumanPrintFlags provides default flags necessary for printing. diff --git a/pkg/printers/BUILD b/pkg/printers/BUILD index e4ec44e80ba..16cf2e36f85 100644 --- a/pkg/printers/BUILD +++ b/pkg/printers/BUILD @@ -1,31 +1,20 @@ package(default_visibility = ["//visibility:public"]) -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = [ "interface.go", "tablegenerator.go", - "tableprinter.go", - "tabwriter.go", ], importpath = "k8s.io/kubernetes/pkg/printers", deps = [ "//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/v1beta1:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", - "//vendor/github.com/liggitt/tabwriter:go_default_library", ], ) @@ -45,16 +34,3 @@ filegroup( ], tags = ["automanaged"], ) - -go_test( - name = "go_default_test", - srcs = ["tableprinter_test.go"], - embed = [":go_default_library"], - deps = [ - "//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/apis/meta/v1/unstructured:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", - "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", - ], -) diff --git a/pkg/printers/interface.go b/pkg/printers/interface.go index aa1e10c3cc7..1da68dee219 100644 --- a/pkg/printers/interface.go +++ b/pkg/printers/interface.go @@ -20,7 +20,6 @@ import ( "io" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" ) // ResourcePrinter is an interface that knows how to print runtime objects. @@ -36,19 +35,3 @@ type ResourcePrinterFunc func(runtime.Object, io.Writer) error func (fn ResourcePrinterFunc) PrintObj(obj runtime.Object, w io.Writer) error { return fn(obj, w) } - -// PrintOptions struct defines a struct for various print options -type PrintOptions struct { - NoHeaders bool - WithNamespace bool - WithKind bool - Wide bool - ShowLabels bool - Kind schema.GroupKind - ColumnLabels []string - - SortBy string - - // indicates if it is OK to ignore missing keys for rendering an output template. - AllowMissingKeys bool -} diff --git a/staging/src/k8s.io/cli-runtime/pkg/printers/BUILD b/staging/src/k8s.io/cli-runtime/pkg/printers/BUILD index f7515915dd7..dc67c1732c6 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/printers/BUILD +++ b/staging/src/k8s.io/cli-runtime/pkg/printers/BUILD @@ -10,6 +10,8 @@ go_library( "jsonpath.go", "name.go", "sourcechecker.go", + "tableprinter.go", + "tabwriter.go", "template.go", "typesetter.go", ], @@ -20,10 +22,15 @@ go_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", + "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/duration:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/client-go/util/jsonpath:go_default_library", + "//vendor/github.com/liggitt/tabwriter:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", ], ) @@ -32,13 +39,16 @@ go_test( name = "go_default_test", srcs = [ "sourcechecker_test.go", + "tableprinter_test.go", "template_test.go", ], embed = [":go_default_library"], deps = [ "//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/apis/meta/v1/unstructured:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", ], ) diff --git a/staging/src/k8s.io/cli-runtime/pkg/printers/interface.go b/staging/src/k8s.io/cli-runtime/pkg/printers/interface.go index b59a935fcab..e06757f6df1 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/printers/interface.go +++ b/staging/src/k8s.io/cli-runtime/pkg/printers/interface.go @@ -20,6 +20,7 @@ import ( "io" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" ) // ResourcePrinterFunc is a function that can print objects @@ -35,3 +36,19 @@ type ResourcePrinter interface { // Print receives a runtime object, formats it and prints it to a writer. PrintObj(runtime.Object, io.Writer) error } + +// PrintOptions struct defines a struct for various print options +type PrintOptions struct { + NoHeaders bool + WithNamespace bool + WithKind bool + Wide bool + ShowLabels bool + Kind schema.GroupKind + ColumnLabels []string + + SortBy string + + // indicates if it is OK to ignore missing keys for rendering an output template. + AllowMissingKeys bool +} diff --git a/pkg/printers/tableprinter.go b/staging/src/k8s.io/cli-runtime/pkg/printers/tableprinter.go similarity index 100% rename from pkg/printers/tableprinter.go rename to staging/src/k8s.io/cli-runtime/pkg/printers/tableprinter.go diff --git a/pkg/printers/tableprinter_test.go b/staging/src/k8s.io/cli-runtime/pkg/printers/tableprinter_test.go similarity index 100% rename from pkg/printers/tableprinter_test.go rename to staging/src/k8s.io/cli-runtime/pkg/printers/tableprinter_test.go diff --git a/pkg/printers/tabwriter.go b/staging/src/k8s.io/cli-runtime/pkg/printers/tabwriter.go similarity index 100% rename from pkg/printers/tabwriter.go rename to staging/src/k8s.io/cli-runtime/pkg/printers/tabwriter.go From 958d7d3b6e74b8648fb897ce09f52049eb9823a1 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 13:32:40 -0700 Subject: [PATCH 2/5] Removes duplicate TabWriter. Several updates to reference the one remaining TabWriter in cli-runtime. --- pkg/kubectl/cmd/auth/BUILD | 1 - pkg/kubectl/cmd/auth/cani.go | 2 +- pkg/kubectl/cmd/get/BUILD | 3 +- pkg/kubectl/cmd/get/customcolumn.go | 3 +- pkg/kubectl/cmd/get/customcolumn_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/apiresources/BUILD | 2 +- .../pkg/cmd/apiresources/apiresources.go | 2 +- .../src/k8s.io/kubectl/pkg/cmd/config/BUILD | 1 - .../kubectl/pkg/cmd/config/get_contexts.go | 2 +- .../src/k8s.io/kubectl/pkg/metricsutil/BUILD | 2 +- .../pkg/metricsutil/metrics_printer.go | 2 +- staging/src/k8s.io/kubectl/pkg/util/BUILD | 1 - .../k8s.io/kubectl/pkg/util/printers/BUILD | 24 ------------- .../kubectl/pkg/util/printers/tabwriter.go | 36 ------------------- 14 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 staging/src/k8s.io/kubectl/pkg/util/printers/BUILD delete mode 100644 staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go diff --git a/pkg/kubectl/cmd/auth/BUILD b/pkg/kubectl/cmd/auth/BUILD index fc2242791b2..a036a22f18b 100644 --- a/pkg/kubectl/cmd/auth/BUILD +++ b/pkg/kubectl/cmd/auth/BUILD @@ -35,7 +35,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/describe/versioned:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go index cdf8457ffd1..4b45408e5cb 100644 --- a/pkg/kubectl/cmd/auth/cani.go +++ b/pkg/kubectl/cmd/auth/cani.go @@ -33,11 +33,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" discovery "k8s.io/client-go/discovery" authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1" cmdutil "k8s.io/kubectl/pkg/cmd/util" describeutil "k8s.io/kubectl/pkg/describe/versioned" - "k8s.io/kubectl/pkg/util/printers" rbacutil "k8s.io/kubectl/pkg/util/rbac" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/pkg/kubectl/cmd/get/BUILD b/pkg/kubectl/cmd/get/BUILD index 43d27778bb0..af2e32ee1a8 100644 --- a/pkg/kubectl/cmd/get/BUILD +++ b/pkg/kubectl/cmd/get/BUILD @@ -53,7 +53,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/interrupt:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/liggitt/tabwriter:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", @@ -96,6 +95,7 @@ go_test( "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/resource:go_default_library", "//staging/src/k8s.io/client-go/rest:go_default_library", "//staging/src/k8s.io/client-go/rest/fake:go_default_library", @@ -104,7 +104,6 @@ go_test( "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/openapi/testing:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library", ], ) diff --git a/pkg/kubectl/cmd/get/customcolumn.go b/pkg/kubectl/cmd/get/customcolumn.go index afe19e1430e..af99c3f64e4 100644 --- a/pkg/kubectl/cmd/get/customcolumn.go +++ b/pkg/kubectl/cmd/get/customcolumn.go @@ -33,7 +33,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/util/jsonpath" - utilprinters "k8s.io/kubectl/pkg/util/printers" ) var jsonRegexp = regexp.MustCompile(`^\{\.?([^{}]+)\}$|^\.?([^{}]+)$`) @@ -164,7 +163,7 @@ func (s *CustomColumnsPrinter) PrintObj(obj runtime.Object, out io.Writer) error } if w, found := out.(*tabwriter.Writer); !found { - w = utilprinters.GetNewTabWriter(out) + w = printers.GetNewTabWriter(out) out = w defer w.Flush() } diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/pkg/kubectl/cmd/get/customcolumn_test.go index 5cb1884d559..e4fb17a8eb7 100644 --- a/pkg/kubectl/cmd/get/customcolumn_test.go +++ b/pkg/kubectl/cmd/get/customcolumn_test.go @@ -25,8 +25,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/kubectl/pkg/scheme" - "k8s.io/kubectl/pkg/util/printers" ) // UniversalDecoder call must specify parameter versions; otherwise it will decode to internal versions. diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD index 6898831622a..300b5573c01 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/BUILD @@ -15,10 +15,10 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go index af57fda2873..9898f56ef09 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apiresources/apiresources.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" cmdutil "k8s.io/kubectl/pkg/cmd/util" - "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD index 98f9ecb49e3..3f739becaf6 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/BUILD @@ -40,7 +40,6 @@ go_library( "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library", "//staging/src/k8s.io/kubectl/pkg/scheme:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/i18n:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/kubectl/pkg/util/templates:go_default_library", "//vendor/github.com/liggitt/tabwriter:go_default_library", "//vendor/github.com/spf13/cobra:go_default_library", diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go index 72d02630e87..a9016a4e740 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/get_contexts.go @@ -28,11 +28,11 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/cli-runtime/pkg/genericclioptions" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" cmdutil "k8s.io/kubectl/pkg/cmd/util" "k8s.io/kubectl/pkg/util/i18n" - "k8s.io/kubectl/pkg/util/printers" "k8s.io/kubectl/pkg/util/templates" ) diff --git a/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD b/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD index 0eada92fcbb..04ec229fa6b 100644 --- a/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/metricsutil/BUILD @@ -16,9 +16,9 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", - "//staging/src/k8s.io/kubectl/pkg/util/printers:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics:go_default_library", "//staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1:go_default_library", ], diff --git a/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go b/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go index 799ca451ccc..0e6e5d6d09d 100644 --- a/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go +++ b/staging/src/k8s.io/kubectl/pkg/metricsutil/metrics_printer.go @@ -23,8 +23,8 @@ import ( "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/kubernetes/scheme" - "k8s.io/kubectl/pkg/util/printers" metricsapi "k8s.io/metrics/pkg/apis/metrics" ) diff --git a/staging/src/k8s.io/kubectl/pkg/util/BUILD b/staging/src/k8s.io/kubectl/pkg/util/BUILD index 37fcf81763a..34d0d8783c8 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/BUILD +++ b/staging/src/k8s.io/kubectl/pkg/util/BUILD @@ -89,7 +89,6 @@ filegroup( "//staging/src/k8s.io/kubectl/pkg/util/logs:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/openapi:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs", - "//staging/src/k8s.io/kubectl/pkg/util/printers:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/qos:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/rbac:all-srcs", "//staging/src/k8s.io/kubectl/pkg/util/resource:all-srcs", diff --git a/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD b/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD deleted file mode 100644 index 164f40669da..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD +++ /dev/null @@ -1,24 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library") - -go_library( - name = "go_default_library", - srcs = ["tabwriter.go"], - importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/printers", - importpath = "k8s.io/kubectl/pkg/util/printers", - visibility = ["//visibility:public"], - deps = ["//vendor/github.com/liggitt/tabwriter:go_default_library"], -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], - visibility = ["//visibility:public"], -) diff --git a/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go b/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go deleted file mode 100644 index f0ebb5dda08..00000000000 --- a/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2018 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package printers - -import ( - "io" - - "github.com/liggitt/tabwriter" -) - -const ( - tabwriterMinWidth = 6 - tabwriterWidth = 4 - tabwriterPadding = 3 - tabwriterPadChar = ' ' - tabwriterFlags = tabwriter.RememberWidths -) - -// GetNewTabWriter returns a tabwriter that translates tabbed columns in input into properly aligned text. -func GetNewTabWriter(output io.Writer) *tabwriter.Writer { - return tabwriter.NewWriter(output, tabwriterMinWidth, tabwriterWidth, tabwriterPadding, tabwriterPadChar, tabwriterFlags) -} From b43992f752d268003ca4353b6e8b8e71729c5659 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 14:12:14 -0700 Subject: [PATCH 3/5] Updates file to reference cli-runtime printer package --- test/e2e/apimachinery/BUILD | 2 +- test/e2e/apimachinery/table_conversion.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/apimachinery/BUILD b/test/e2e/apimachinery/BUILD index 8524e30780f..a60c8f93dc1 100644 --- a/test/e2e/apimachinery/BUILD +++ b/test/e2e/apimachinery/BUILD @@ -30,7 +30,6 @@ go_library( deps = [ "//pkg/api/v1/pod:go_default_library", "//pkg/apis/rbac/v1:go_default_library", - "//pkg/printers:go_default_library", "//pkg/quota/v1/evaluator/core:go_default_library", "//staging/src/k8s.io/api/admissionregistration/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", @@ -69,6 +68,7 @@ go_library( "//staging/src/k8s.io/apiserver/pkg/storage/names:go_default_library", "//staging/src/k8s.io/apiserver/pkg/storage/storagebackend:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", + "//staging/src/k8s.io/cli-runtime/pkg/printers:go_default_library", "//staging/src/k8s.io/client-go/discovery:go_default_library", "//staging/src/k8s.io/client-go/dynamic:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", diff --git a/test/e2e/apimachinery/table_conversion.go b/test/e2e/apimachinery/table_conversion.go index 0303674a0c5..27c294caaa0 100644 --- a/test/e2e/apimachinery/table_conversion.go +++ b/test/e2e/apimachinery/table_conversion.go @@ -33,7 +33,7 @@ import ( "k8s.io/client-go/util/workqueue" utilversion "k8s.io/apimachinery/pkg/util/version" - "k8s.io/kubernetes/pkg/printers" + "k8s.io/cli-runtime/pkg/printers" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" ) From 71c71d78c3ac56f3dc8f4c8ffe2f8275826587ad Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 15:07:03 -0700 Subject: [PATCH 4/5] Updates module dependencies due to moving tabwriter.go --- staging/src/k8s.io/cli-runtime/go.mod | 1 + staging/src/k8s.io/cli-runtime/go.sum | 2 ++ staging/src/k8s.io/sample-cli-plugin/go.sum | 2 ++ vendor/modules.txt | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/staging/src/k8s.io/cli-runtime/go.mod b/staging/src/k8s.io/cli-runtime/go.mod index 5dd4807809b..63c38a31b5f 100644 --- a/staging/src/k8s.io/cli-runtime/go.mod +++ b/staging/src/k8s.io/cli-runtime/go.mod @@ -10,6 +10,7 @@ require ( github.com/evanphx/json-patch v4.2.0+incompatible github.com/ghodss/yaml v0.0.0-20180820084758-c7ce16629ff4 // indirect github.com/go-openapi/spec v0.19.2 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/pkg/errors v0.8.0 github.com/spf13/cobra v0.0.5 github.com/spf13/pflag v1.0.3 diff --git a/staging/src/k8s.io/cli-runtime/go.sum b/staging/src/k8s.io/cli-runtime/go.sum index 7b76a2e24dd..94002f532f0 100644 --- a/staging/src/k8s.io/cli-runtime/go.sum +++ b/staging/src/k8s.io/cli-runtime/go.sum @@ -101,6 +101,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4= diff --git a/staging/src/k8s.io/sample-cli-plugin/go.sum b/staging/src/k8s.io/sample-cli-plugin/go.sum index 7b76a2e24dd..94002f532f0 100644 --- a/staging/src/k8s.io/sample-cli-plugin/go.sum +++ b/staging/src/k8s.io/sample-cli-plugin/go.sum @@ -101,6 +101,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= +github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63 h1:nTT4s92Dgz2HlrB2NaMgvlfqHH39OgMhA7z3PK7PGD4= diff --git a/vendor/modules.txt b/vendor/modules.txt index 611c51b1812..80778f12862 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1817,7 +1817,6 @@ k8s.io/kubectl/pkg/util/openapi k8s.io/kubectl/pkg/util/openapi/testing k8s.io/kubectl/pkg/util/openapi/validation k8s.io/kubectl/pkg/util/podutils -k8s.io/kubectl/pkg/util/printers k8s.io/kubectl/pkg/util/qos k8s.io/kubectl/pkg/util/rbac k8s.io/kubectl/pkg/util/resource From 1b40a8849d57dc17d8fd6a1084cc150b569eff13 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Thu, 17 Oct 2019 16:25:15 -0700 Subject: [PATCH 5/5] Ignore staticcheck again for tableprinter.go --- hack/.staticcheck_failures | 1 + 1 file changed, 1 insertion(+) diff --git a/hack/.staticcheck_failures b/hack/.staticcheck_failures index 32efedfb3f7..d570fff887c 100644 --- a/hack/.staticcheck_failures +++ b/hack/.staticcheck_failures @@ -162,6 +162,7 @@ vendor/k8s.io/apiserver/pkg/util/wsstream vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/oidc vendor/k8s.io/apiserver/plugin/pkg/authenticator/token/webhook vendor/k8s.io/apiserver/plugin/pkg/authorizer/webhook +vendor/k8s.io/cli-runtime/pkg/printers vendor/k8s.io/client-go/discovery/cached/memory vendor/k8s.io/client-go/dynamic/fake vendor/k8s.io/client-go/metadata/fake