From 6ad56325cab2b38d64b234163705f8c7132b8e3d Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Tue, 8 May 2018 16:43:24 +0800
Subject: [PATCH 1/2] kube-proxy should not depend on kubectl

---
 cmd/kube-proxy/app/BUILD     |  1 -
 cmd/kube-proxy/app/server.go | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cmd/kube-proxy/app/BUILD b/cmd/kube-proxy/app/BUILD
index 3ae5ab8f044..4b40cbdedcd 100644
--- 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",
diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go
index 60468d6990c..6161f15d9fe 100644
--- 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())
-			cmdutil.CheckErr(opts.Validate(args))
-			cmdutil.CheckErr(opts.Run())
+			if err := opts.Complete(); err != nil {
+				glog.Fatalf("failed complete: %v", err)
+			}
+			if err := opts.Validate(args); err != nil {
+				glog.Fatalf("failed validate: %v", err)
+			}
+			glog.Fatal(opts.Run())
 		},
 	}
 

From f66bafd12cc6d7503f529dc4f2dce1367c14c9a4 Mon Sep 17 00:00:00 2001
From: xuzhonghu <xuzhonghu@huawei.com>
Date: Thu, 17 May 2018 11:13:41 +0800
Subject: [PATCH 2/2] remove kube-proxy and kube-scheduler from
 pkg_kubectl_cmd_util_CONSUMES_BAD group

---
 build/visible_to/BUILD | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD
index 752599ee075..693d8ea1833 100644
--- a/build/visible_to/BUILD
+++ b/build/visible_to/BUILD
@@ -200,22 +200,12 @@ 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",