From cb00bf904eb62c69a047b1a2909ec606a6e57068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= <lucas@weave.works>
Date: Sun, 27 Aug 2017 18:39:26 +0300
Subject: [PATCH] kubeadm: Cut unnecessary kubectl dependency

---
 build/visible_to/BUILD     | 1 -
 cmd/kubeadm/app/BUILD      | 1 -
 cmd/kubeadm/app/cmd/cmd.go | 3 +--
 cmd/kubeadm/app/kubeadm.go | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/build/visible_to/BUILD b/build/visible_to/BUILD
index 788adc982cb..b3d971f6667 100644
--- a/build/visible_to/BUILD
+++ b/build/visible_to/BUILD
@@ -81,7 +81,6 @@ package_group(
 package_group(
     name = "KUBEADM_BAD",
     packages = [
-        "//cmd/kubeadm/app",
         "//cmd/kubeadm/app/cmd",
     ],
 )
diff --git a/cmd/kubeadm/app/BUILD b/cmd/kubeadm/app/BUILD
index c3705c11052..e1936654c5f 100644
--- a/cmd/kubeadm/app/BUILD
+++ b/cmd/kubeadm/app/BUILD
@@ -11,7 +11,6 @@ go_library(
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm/install:go_default_library",
         "//cmd/kubeadm/app/cmd:go_default_library",
-        "//pkg/kubectl/cmd/util:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
     ],
 )
diff --git a/cmd/kubeadm/app/cmd/cmd.go b/cmd/kubeadm/app/cmd/cmd.go
index 9546f0d1042..5663bbbffc4 100644
--- a/cmd/kubeadm/app/cmd/cmd.go
+++ b/cmd/kubeadm/app/cmd/cmd.go
@@ -25,10 +25,9 @@ import (
 	"k8s.io/apiserver/pkg/util/flag"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/phases"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd/upgrade"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
-func NewKubeadmCommand(f cmdutil.Factory, in io.Reader, out, err io.Writer) *cobra.Command {
+func NewKubeadmCommand(_ io.Reader, out, err io.Writer) *cobra.Command {
 	cmds := &cobra.Command{
 		Use:   "kubeadm",
 		Short: "kubeadm: easily bootstrap a secure Kubernetes cluster",
diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go
index 5a764a2cda5..aae44e1f31c 100644
--- a/cmd/kubeadm/app/kubeadm.go
+++ b/cmd/kubeadm/app/kubeadm.go
@@ -23,7 +23,6 @@ import (
 
 	_ "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/install"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd"
-	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 )
 
 func Run() error {
@@ -31,6 +30,6 @@ func Run() error {
 	pflag.CommandLine.MarkHidden("google-json-key")
 	pflag.CommandLine.MarkHidden("log-flush-frequency")
 
-	cmd := cmd.NewKubeadmCommand(cmdutil.NewFactory(nil), os.Stdin, os.Stdout, os.Stderr)
+	cmd := cmd.NewKubeadmCommand(os.Stdin, os.Stdout, os.Stderr)
 	return cmd.Execute()
 }