From c6a8c8a72ef0f491a70ca80445c006c4932e4ac2 Mon Sep 17 00:00:00 2001
From: Sean Sullivan <seans@google.com>
Date: Thu, 17 Oct 2019 13:32:40 -0700
Subject: [PATCH] Removes duplicate TabWriter. Several updates to reference the
 one remaining TabWriter in cli-runtime.

Kubernetes-commit: 958d7d3b6e74b8648fb897ce09f52049eb9823a1
---
 pkg/cmd/apiresources/apiresources.go |  2 +-
 pkg/cmd/config/get_contexts.go       |  2 +-
 pkg/metricsutil/metrics_printer.go   |  2 +-
 pkg/util/printers/tabwriter.go       | 36 ----------------------------
 4 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkg/util/printers/tabwriter.go

diff --git a/pkg/cmd/apiresources/apiresources.go b/pkg/cmd/apiresources/apiresources.go
index af57fda28..9898f56ef 100644
--- a/pkg/cmd/apiresources/apiresources.go
+++ b/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/pkg/cmd/config/get_contexts.go b/pkg/cmd/config/get_contexts.go
index 72d02630e..a9016a4e7 100644
--- a/pkg/cmd/config/get_contexts.go
+++ b/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/pkg/metricsutil/metrics_printer.go b/pkg/metricsutil/metrics_printer.go
index 799ca451c..0e6e5d6d0 100644
--- a/pkg/metricsutil/metrics_printer.go
+++ b/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/pkg/util/printers/tabwriter.go b/pkg/util/printers/tabwriter.go
deleted file mode 100644
index f0ebb5dda..000000000
--- a/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)
-}