Merge pull request #79202 from sallyom/mv-kubectl-util-podutils-stg

Move pkg/kubectl/util/podutils to staging

pkg/kubectl/BUILD

@@ -63,7 +63,6 @@ go_library(
         "//pkg/kubectl/scheme:go_default_library",
         "//pkg/kubectl/util:go_default_library",
         "//pkg/kubectl/util/deployment:go_default_library",
-        "//pkg/kubectl/util/podutils:go_default_library",
         "//pkg/kubectl/util/slice:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
@@ -88,6 +87,7 @@ go_library(
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/scale:go_default_library",
         "//staging/src/k8s.io/client-go/util/retry:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",
         "//vendor/k8s.io/utils/integer:go_default_library",
         "//vendor/k8s.io/utils/pointer:go_default_library",
     ],

pkg/kubectl/polymorphichelpers/BUILD

@@ -25,7 +25,6 @@ go_library(
         "//pkg/kubectl:go_default_library",
         "//pkg/kubectl/generate:go_default_library",
         "//pkg/kubectl/scheme:go_default_library",
-        "//pkg/kubectl/util/podutils:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta2:go_default_library",
@@ -45,6 +44,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
         "//staging/src/k8s.io/client-go/tools/watch:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",
     ],
 )
 
@@ -63,7 +63,6 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/kubectl/util/podutils:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta1:go_default_library",
         "//staging/src/k8s.io/api/apps/v1beta2:go_default_library",
@@ -81,6 +80,7 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
         "//staging/src/k8s.io/client-go/testing:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/podutils:go_default_library",
     ],
 )
 

pkg/kubectl/polymorphichelpers/attachablepodforobject.go

@@ -25,7 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/kubernetes/pkg/kubectl/util/podutils"
+	"k8s.io/kubectl/pkg/util/podutils"
 )
 
 // attachablePodForObject returns the pod to which to attach given an object.

pkg/kubectl/polymorphichelpers/helpers_test.go

@@ -29,7 +29,7 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 	fakeexternal "k8s.io/client-go/kubernetes/fake"
 	testcore "k8s.io/client-go/testing"
-	"k8s.io/kubernetes/pkg/kubectl/util/podutils"
+	"k8s.io/kubectl/pkg/util/podutils"
 )
 
 func TestGetFirstPod(t *testing.T) {

pkg/kubectl/polymorphichelpers/logsforobject.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
-	"k8s.io/kubernetes/pkg/kubectl/util/podutils"
+	"k8s.io/kubectl/pkg/util/podutils"
 )
 
 func logsForObject(restClientGetter genericclioptions.RESTClientGetter, object, options runtime.Object, timeout time.Duration, allContainers bool) ([]rest.ResponseWrapper, error) {

pkg/kubectl/rolling_updater.go

@@ -34,9 +34,9 @@ import (
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	scaleclient "k8s.io/client-go/scale"
 	"k8s.io/client-go/util/retry"
+	"k8s.io/kubectl/pkg/util/podutils"
 	"k8s.io/kubernetes/pkg/kubectl/util"
 	deploymentutil "k8s.io/kubernetes/pkg/kubectl/util/deployment"
-	"k8s.io/kubernetes/pkg/kubectl/util/podutils"
 	"k8s.io/utils/integer"
 	utilpointer "k8s.io/utils/pointer"
 )

pkg/kubectl/util/BUILD

@@ -73,7 +73,6 @@ filegroup(
         "//pkg/kubectl/util/hash:all-srcs",
         "//pkg/kubectl/util/i18n:all-srcs",
         "//pkg/kubectl/util/logs:all-srcs",
-        "//pkg/kubectl/util/podutils:all-srcs",
         "//pkg/kubectl/util/qos:all-srcs",
         "//pkg/kubectl/util/rbac:all-srcs",
         "//pkg/kubectl/util/resource:all-srcs",

staging/publishing/import-restrictions.yaml

@@ -125,9 +125,11 @@
 
 - baseImportPath: "./vendor/k8s.io/kubectl/"
   allowedImports:
+  - k8s.io/api
   - k8s.io/apimachinery
   - k8s.io/client-go
   - k8s.io/kubectl
+  - k8s.io/utils
 
 - baseImportPath: "./vendor/k8s.io/sample-apiserver/"
   allowedImports:

staging/src/k8s.io/kubectl/BUILD

@@ -10,6 +10,7 @@ filegroup(
     srcs = [
         ":package-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/interrupt: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/templates:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/term:all-srcs",

staging/src/k8s.io/kubectl/go.mod

@@ -17,8 +17,10 @@ require (
 	github.com/spf13/pflag v1.0.3
 	golang.org/x/sys v0.0.0-20190312061237-fead79001313
 	gotest.tools v2.2.0+incompatible // indirect
+	k8s.io/api v0.0.0
 	k8s.io/apimachinery v0.0.0
 	k8s.io/client-go v0.0.0
+	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 )
 
 replace (

staging/src/k8s.io/kubectl/pkg/util/podutils/BUILD

@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["podutils.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/util/podutils",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/podutils",
+    importpath = "k8s.io/kubectl/pkg/util/podutils",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/core/v1:go_default_library",

vendor/modules.txt

@@ -1634,6 +1634,7 @@ k8s.io/kube-proxy/config/v1alpha1
 k8s.io/kube-scheduler/config/v1alpha1
 # k8s.io/kubectl v0.0.0 => ./staging/src/k8s.io/kubectl
 k8s.io/kubectl/pkg/util/interrupt
+k8s.io/kubectl/pkg/util/podutils
 k8s.io/kubectl/pkg/util/printers
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term