Merge pull request #48295 from mengqiy/kubectl_util

Automatic merge from submit-queue (batch tested with PRs 48295, 48298, 47339, 44910, 48037) eliminate kubectl dependency on k8s.io/kubernetes/pkg/util Ref: https://github.com/kubernetes/kubernetes/issues/48209 /assign @apelisse @monopole cc: @pwittrock ```release-note NONE ```

Merge pull request #48295 from mengqiy/kubectl_util
3dcd3089 · Kubernetes Submit Queue · GitHub · 17e19dfc · 6660726c · 3dcd3089
Commit 3dcd3089 authored Jun 30, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 30, 2017
6 changed files
--- a/pkg/kubectl/BUILD
+++ b/pkg/kubectl/BUILD
@@ -145,7 +145,6 @@ go_library(
        "//pkg/kubectl/util:go_default_library",
        "//pkg/printers:go_default_library",
        "//pkg/printers/internalversion:go_default_library",
-        "//pkg/util:go_default_library",
        "//pkg/util/slice:go_default_library",
        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
        "//vendor/github.com/golang/glog:go_default_library",

--- a/pkg/kubectl/proxy_server.go
+++ b/pkg/kubectl/proxy_server.go
@@ -29,7 +29,7 @@ import (

 	"github.com/golang/glog"
 	restclient "k8s.io/client-go/rest"
-	"k8s.io/kubernetes/pkg/util"
+	"k8s.io/kubernetes/pkg/kubectl/util"
 )

 const (

--- a/pkg/kubectl/stop.go
+++ b/pkg/kubectl/stop.go
@@ -38,7 +38,6 @@ import (
 	coreclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/internalversion"
 	extensionsclient "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/extensions/internalversion"
 	deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
-	"k8s.io/kubernetes/pkg/util"
 )

 const (
@@ -401,7 +400,8 @@ func (reaper *DeploymentReaper) Stop(namespace, name string, timeout time.Durati
 	deployment, err := reaper.updateDeploymentWithRetries(namespace, name, func(d *extensions.Deployment) {
 		// set deployment's history and scale to 0
 		// TODO replace with patch when available: https://github.com/kubernetes/kubernetes/issues/20527
-		d.Spec.RevisionHistoryLimit = util.Int32Ptr(0)
+		rhl := int32(0)
+		d.Spec.RevisionHistoryLimit = &rhl
 		d.Spec.Replicas = 0
 		d.Spec.Paused = true
 	})

--- a/pkg/kubectl/util/BUILD
+++ b/pkg/kubectl/util/BUILD
@@ -7,7 +7,10 @@ load(

 go_library(
    name = "go_default_library",
-    srcs = ["util.go"],
+    srcs = [
+        "umask.go",
+        "util.go",
+    ],
    tags = ["automanaged"],
    visibility = ["//build/visible_to:pkg_kubectl_util_CONSUMERS"],
    deps = [

--- a/pkg/util/umask.go
+++ b/pkg/util/umask.go
--- a/pkg/util/BUILD
+++ b/pkg/util/BUILD
@@ -13,7 +13,6 @@ go_library(
    srcs = [
        "doc.go",
        "template.go",
-        "umask.go",
        "util.go",
    ],
    tags = ["automanaged"],