Merge pull request kubernetes#80701 from seans3/move-cmdutil-staging

Move pkg/kubectl/cmd/util and subdirs to staging

Author: k8s-ci-robot

cmd/clicheck/BUILD

@@ -17,7 +17,7 @@ go_library(
     importpath = "k8s.io/kubernetes/cmd/clicheck",
     deps = [
         "//pkg/kubectl/cmd:go_default_library",
-        "//pkg/kubectl/cmd/util/sanity:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util/sanity:go_default_library",
     ],
 )
 

cmd/clicheck/check_cli_conventions.go

@@ -21,8 +21,8 @@ import (
 	"io/ioutil"
 	"os"
 
+	cmdsanity "k8s.io/kubectl/pkg/cmd/util/sanity"
 	"k8s.io/kubernetes/pkg/kubectl/cmd"
-	cmdsanity "k8s.io/kubernetes/pkg/kubectl/cmd/util/sanity"
 )
 
 func main() {

hack/.golint_failures

@@ -137,7 +137,6 @@ pkg/kubectl/cmd/set
 pkg/kubectl/cmd/taint
 pkg/kubectl/cmd/testing
 pkg/kubectl/cmd/top
-pkg/kubectl/cmd/util
 pkg/kubectl/cmd/wait
 pkg/kubectl/generate
 pkg/kubectl/generate/versioned
@@ -538,6 +537,7 @@ staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
 staging/src/k8s.io/kube-aggregator/pkg/apiserver
 staging/src/k8s.io/kube-aggregator/pkg/controllers/autoregister
 staging/src/k8s.io/kube-proxy/config/v1alpha1
+staging/src/k8s.io/kubectl/pkg/cmd/util
 staging/src/k8s.io/kubectl/pkg/describe/versioned
 staging/src/k8s.io/kubectl/pkg/util/templates
 staging/src/k8s.io/kubelet/config/v1beta1

pkg/kubectl/cmd/BUILD

@@ -54,12 +54,12 @@ go_library(
         "//pkg/kubectl/cmd/set:go_default_library",
         "//pkg/kubectl/cmd/taint: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",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
         "//staging/src/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//staging/src/k8s.io/component-base/cli/flag: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/templates:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
@@ -78,8 +78,8 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/cmd/util:go_default_library",
         "//staging/src/k8s.io/cli-runtime/pkg/genericclioptions:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/cmd/util:go_default_library",
     ],
 )
 
@@ -133,7 +133,6 @@ filegroup(
         "//pkg/kubectl/cmd/taint:all-srcs",
         "//pkg/kubectl/cmd/testing:all-srcs",
         "//pkg/kubectl/cmd/top:all-srcs",
-        "//pkg/kubectl/cmd/util:all-srcs",
         "//pkg/kubectl/cmd/version:all-srcs",
         "//pkg/kubectl/cmd/wait:all-srcs",
     ],

pkg/kubectl/cmd/alpha.go

@@ -20,9 +20,9 @@ import (
 	"github.com/spf13/cobra"
 
 	"k8s.io/cli-runtime/pkg/genericclioptions"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 // NewCmdAlpha creates a command that acts as an alternate root command for features in alpha

pkg/kubectl/cmd/annotate/BUILD

@@ -6,7 +6,6 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/annotate",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/kubectl/polymorphichelpers: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",
@@ -16,6 +15,7 @@ go_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/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/templates:go_default_library",

pkg/kubectl/cmd/annotate/annotate.go

@@ -34,10 +34,10 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/cli-runtime/pkg/printers"
 	"k8s.io/cli-runtime/pkg/resource"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/scheme"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubectl/polymorphichelpers"
 )
 

pkg/kubectl/cmd/apiresources/BUILD

@@ -9,13 +9,13 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/kubectl/cmd/apiresources",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/kubectl/cmd/util: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",
         "//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/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",

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"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/printers"
 	"k8s.io/kubectl/pkg/util/templates"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 var (

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"
+	cmdutil "k8s.io/kubectl/pkg/cmd/util"
 	"k8s.io/kubectl/pkg/util/i18n"
 	"k8s.io/kubectl/pkg/util/templates"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 var (