From 5f3818230d925c101c5fe3c74659e1831b09d996 Mon Sep 17 00:00:00 2001
From: Mike Dame <mdame@redhat.com>
Date: Wed, 19 Jun 2019 22:53:53 -0400
Subject: [PATCH] Move pkg/util/printers to staging and update refs

---
 pkg/kubectl/cmd/apiresources/apiresources.go                    | 2 +-
 pkg/kubectl/cmd/auth/cani.go                                    | 2 +-
 pkg/kubectl/cmd/config/get_contexts.go                          | 2 +-
 pkg/kubectl/cmd/get/customcolumn.go                             | 2 +-
 pkg/kubectl/cmd/get/customcolumn_test.go                        | 2 +-
 pkg/kubectl/cmd/get/get.go                                      | 2 +-
 pkg/kubectl/metricsutil/metrics_printer.go                      | 2 +-
 .../src/k8s.io/kubectl/pkg}/util/printers/BUILD                 | 0
 .../src/k8s.io/kubectl/pkg}/util/printers/tabwriter.go          | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/printers/BUILD (100%)
 rename {pkg/kubectl => staging/src/k8s.io/kubectl/pkg}/util/printers/tabwriter.go (100%)

diff --git a/pkg/kubectl/cmd/apiresources/apiresources.go b/pkg/kubectl/cmd/apiresources/apiresources.go
index 84245a04b0d..f6620f0d263 100644
--- a/pkg/kubectl/cmd/apiresources/apiresources.go
+++ b/pkg/kubectl/cmd/apiresources/apiresources.go
@@ -29,9 +29,9 @@ import (
 	"k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+	"k8s.io/kubectl/pkg/util/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
-	"k8s.io/kubernetes/pkg/kubectl/util/printers"
 )
 
 var (
diff --git a/pkg/kubectl/cmd/auth/cani.go b/pkg/kubectl/cmd/auth/cani.go
index aa6a99edc82..3b2d7efe4be 100644
--- a/pkg/kubectl/cmd/auth/cani.go
+++ b/pkg/kubectl/cmd/auth/cani.go
@@ -35,10 +35,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	discovery "k8s.io/client-go/discovery"
 	authorizationv1client "k8s.io/client-go/kubernetes/typed/authorization/v1"
+	"k8s.io/kubectl/pkg/util/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	describeutil "k8s.io/kubernetes/pkg/kubectl/describe/versioned"
-	"k8s.io/kubernetes/pkg/kubectl/util/printers"
 	rbacutil "k8s.io/kubernetes/pkg/kubectl/util/rbac"
 )
 
diff --git a/pkg/kubectl/cmd/config/get_contexts.go b/pkg/kubectl/cmd/config/get_contexts.go
index d56ea687d4a..0fd6e491e32 100644
--- a/pkg/kubectl/cmd/config/get_contexts.go
+++ b/pkg/kubectl/cmd/config/get_contexts.go
@@ -30,10 +30,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/tools/clientcmd"
 	clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
+	"k8s.io/kubectl/pkg/util/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
-	"k8s.io/kubernetes/pkg/kubectl/util/printers"
 )
 
 // GetContextsOptions contains the assignable options from the args.
diff --git a/pkg/kubectl/cmd/get/customcolumn.go b/pkg/kubectl/cmd/get/customcolumn.go
index 28825d90c38..7beb0d6d11e 100644
--- a/pkg/kubectl/cmd/get/customcolumn.go
+++ b/pkg/kubectl/cmd/get/customcolumn.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/client-go/util/jsonpath"
-	utilprinters "k8s.io/kubernetes/pkg/kubectl/util/printers"
+	utilprinters "k8s.io/kubectl/pkg/util/printers"
 )
 
 var jsonRegexp = regexp.MustCompile("^\\{\\.?([^{}]+)\\}$|^\\.?([^{}]+)$")
diff --git a/pkg/kubectl/cmd/get/customcolumn_test.go b/pkg/kubectl/cmd/get/customcolumn_test.go
index b4af2025ebd..c8a8ed756f5 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/kubectl/pkg/util/printers"
 	"k8s.io/kubernetes/pkg/kubectl/scheme"
-	"k8s.io/kubernetes/pkg/kubectl/util/printers"
 )
 
 // UniversalDecoder call must specify parameter versions; otherwise it will decode to internal versions.
diff --git a/pkg/kubectl/cmd/get/get.go b/pkg/kubectl/cmd/get/get.go
index def6ee32c04..5f39a5adbd4 100644
--- a/pkg/kubectl/cmd/get/get.go
+++ b/pkg/kubectl/cmd/get/get.go
@@ -44,11 +44,11 @@ import (
 	"k8s.io/client-go/rest"
 	watchtools "k8s.io/client-go/tools/watch"
 	"k8s.io/kubectl/pkg/util/interrupt"
+	utilprinters "k8s.io/kubectl/pkg/util/printers"
 	"k8s.io/kubectl/pkg/util/templates"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/util/i18n"
-	utilprinters "k8s.io/kubernetes/pkg/kubectl/util/printers"
 )
 
 // GetOptions contains the input to the get command.
diff --git a/pkg/kubectl/metricsutil/metrics_printer.go b/pkg/kubectl/metricsutil/metrics_printer.go
index fe8464452b7..799ca451ccc 100644
--- a/pkg/kubectl/metricsutil/metrics_printer.go
+++ b/pkg/kubectl/metricsutil/metrics_printer.go
@@ -24,7 +24,7 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/kubernetes/pkg/kubectl/util/printers"
+	"k8s.io/kubectl/pkg/util/printers"
 	metricsapi "k8s.io/metrics/pkg/apis/metrics"
 )
 
diff --git a/pkg/kubectl/util/printers/BUILD b/staging/src/k8s.io/kubectl/pkg/util/printers/BUILD
similarity index 100%
rename from pkg/kubectl/util/printers/BUILD
rename to staging/src/k8s.io/kubectl/pkg/util/printers/BUILD
diff --git a/pkg/kubectl/util/printers/tabwriter.go b/staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go
similarity index 100%
rename from pkg/kubectl/util/printers/tabwriter.go
rename to staging/src/k8s.io/kubectl/pkg/util/printers/tabwriter.go