Merge pull request kubernetes#72418 from liggitt/align-watch-output

fix tabwriter to remember column widths, align `kubectl get -w` output

Author: k8s-ci-robot

Godeps/Godeps.json

@@ -41,6 +41,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd/api:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd/api/latest:go_default_library",
+        "//vendor/github.com/liggitt/tabwriter:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
     ],
 )

Godeps/LICENSES

@@ -21,8 +21,8 @@ import (
 	"io"
 	"sort"
 	"strings"
-	"text/tabwriter"
 
+	"github.com/liggitt/tabwriter"
 	"github.com/spf13/cobra"
 
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"

pkg/kubectl/cmd/config/BUILD

@@ -55,6 +55,7 @@ go_library(
         "//staging/src/k8s.io/client-go/tools/watch:go_default_library",
         "//staging/src/k8s.io/client-go/util/integer:go_default_library",
         "//staging/src/k8s.io/client-go/util/jsonpath:go_default_library",
+        "//vendor/github.com/liggitt/tabwriter:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/vbom.ml/util/sortorder:go_default_library",

pkg/kubectl/cmd/config/get_contexts.go

@@ -24,7 +24,8 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
-	"text/tabwriter"
+
+	"github.com/liggitt/tabwriter"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"

pkg/kubectl/cmd/get/BUILD

@@ -537,6 +537,7 @@ func (o *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []string) e
 
 		if shouldGetNewPrinterForMapping(printer, lastMapping, mapping) {
 			w.Flush()
+			w.SetRememberedWidths(nil)
 
 			// TODO: this doesn't belong here
 			// add linebreak between resource groups (if there is more than one)
@@ -654,10 +655,11 @@ func (o *GetOptions) watch(f cmdutil.Factory, cmd *cobra.Command, args []string)
 		}
 	}
 
+	writer := utilprinters.GetNewTabWriter(o.Out)
+
 	// print the current object
 	if !o.WatchOnly {
 		var objsToPrint []runtime.Object
-		writer := utilprinters.GetNewTabWriter(o.Out)
 
 		if isList {
 			objsToPrint, _ = meta.ExtractList(obj)
@@ -702,9 +704,10 @@ func (o *GetOptions) watch(f cmdutil.Factory, cmd *cobra.Command, args []string)
 				internalGV := mapping.GroupVersionKind.GroupKind().WithVersion(runtime.APIVersionInternal).GroupVersion()
 				objToPrint = attemptToConvertToInternal(e.Object, legacyscheme.Scheme, internalGV)
 			}
-			if err := printer.PrintObj(objToPrint, o.Out); err != nil {
+			if err := printer.PrintObj(objToPrint, writer); err != nil {
 				return false, err
 			}
+			writer.Flush()
 			return false, nil
 		})
 		return err

pkg/kubectl/cmd/get/customcolumn.go

@@ -1211,8 +1211,8 @@ func TestWatchLabelSelector(t *testing.T) {
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 bar    0/0              0          <unknown>
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)
@@ -1262,8 +1262,8 @@ func TestWatchFieldSelector(t *testing.T) {
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 bar    0/0              0          <unknown>
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)
@@ -1305,8 +1305,8 @@ func TestWatchResource(t *testing.T) {
 
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)
@@ -1349,8 +1349,8 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) {
 
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)
@@ -1392,7 +1392,7 @@ func TestWatchOnlyResource(t *testing.T) {
 
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)
@@ -1437,7 +1437,7 @@ func TestWatchOnlyList(t *testing.T) {
 
 	expected := `NAME   READY   STATUS   RESTARTS   AGE
 foo    0/0              0          <unknown>
-foo   0/0         0     <unknown>
+foo    0/0              0          <unknown>
 `
 	if e, a := expected, buf.String(); e != a {
 		t.Errorf("expected\n%v\ngot\n%v", e, a)

pkg/kubectl/cmd/get/get.go

@@ -5,6 +5,7 @@ go_library(
     srcs = ["tabwriter.go"],
     importpath = "k8s.io/kubernetes/pkg/kubectl/util/printers",
     visibility = ["//visibility:public"],
+    deps = ["//vendor/github.com/liggitt/tabwriter:go_default_library"],
 )
 
 filegroup(

pkg/kubectl/cmd/get/get_test.go

@@ -18,15 +18,16 @@ package printers
 
 import (
 	"io"
-	"text/tabwriter"
+
+	"github.com/liggitt/tabwriter"
 )
 
 const (
 	tabwriterMinWidth = 6
 	tabwriterWidth    = 4
 	tabwriterPadding  = 3
 	tabwriterPadChar  = ' '
-	tabwriterFlags    = 0
+	tabwriterFlags    = tabwriter.RememberWidths
 )
 
 // GetNewTabWriter returns a tabwriter that translates tabbed columns in input into properly aligned text.