Merge pull request #63532 from hzxuzhonghu/scheduler-not-depend-kubectl

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. kube-proxy and kube-scheduler should not depend on pkg/kubectl remove dependent on pkg/kubectl/cmd/util in kube-proxy and kube-scheduler **Release note**: ```release-note NONE ```

Merge pull request #63532 from hzxuzhonghu/scheduler-not-depend-kubectl
65713101 · Kubernetes Submit Queue · GitHub · 34383aa0 · f66bafd1 · 65713101
Unverified Commit 65713101 authored May 28, 2018 by Kubernetes Submit Queue Committed by GitHub May 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 16 deletions

BUILD build/visible_to/BUILD +1 -11

BUILD cmd/kube-proxy/app/BUILD +0 -1

server.go cmd/kube-proxy/app/server.go +7 -4

No files found.
--- a/build/visible_to/BUILD
+++ b/build/visible_to/BUILD
@@ -203,21 +203,11 @@ package_group(
 )
 package_group(
-    name = "pkg_kubectl_cmd_util_CONSUMERS_BAD",
-    includes = [
-        ":KUBEADM_BAD",
-    ],
-    packages = [
-        "//cmd/kube-proxy/app",
-    ],
-)
-package_group(
    name = "pkg_kubectl_cmd_util_CONSUMERS",
    includes = [
        ":COMMON_generators",
        ":COMMON_testing",
-        ":pkg_kubectl_cmd_util_CONSUMERS_BAD",
+        ":KUBEADM_BAD",
    ],
    packages = [
        "//cmd/kubectl",

--- a/cmd/kube-proxy/app/BUILD
+++ b/cmd/kube-proxy/app/BUILD
@@ -64,7 +64,6 @@ go_library(
        "//pkg/apis/core:go_default_library",
        "//pkg/client/clientset_generated/internalclientset:go_default_library",
        "//pkg/client/informers/informers_generated/internalversion:go_default_library",
-        "//pkg/kubectl/cmd/util:go_default_library",
        "//pkg/kubelet/qos:go_default_library",
        "//pkg/master/ports:go_default_library",
        "//pkg/proxy:go_default_library",

--- a/cmd/kube-proxy/app/server.go
+++ b/cmd/kube-proxy/app/server.go
@@ -51,7 +51,6 @@ import (
 	api "k8s.io/kubernetes/pkg/apis/core"
 	clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/kubelet/qos"
 	"k8s.io/kubernetes/pkg/master/ports"
 	"k8s.io/kubernetes/pkg/proxy"
@@ -353,9 +352,13 @@ with the apiserver API to configure the proxy.`,
 				glog.Fatalf("failed OS init: %v", err)
 			}
-			cmdutil.CheckErr(opts.Complete())
+			if err := opts.Complete(); err != nil {
-			cmdutil.CheckErr(opts.Validate(args))
+				glog.Fatalf("failed complete: %v", err)
-			cmdutil.CheckErr(opts.Run())
+			}
+			if err := opts.Validate(args); err != nil {
+				glog.Fatalf("failed validate: %v", err)
+			}
+			glog.Fatal(opts.Run())
 		},
 	}