From 7d5ece2e2c96ecf49a455854a9cc5e8448a66dfc Mon Sep 17 00:00:00 2001
From: SataQiu <qiushida@beyondcent.com>
Date: Tue, 9 Jul 2019 10:42:22 +0800
Subject: [PATCH] kubeadm: move klog.InitFlags into app/kubeadm.go

---
 cmd/kubeadm/BUILD          | 5 +----
 cmd/kubeadm/app/kubeadm.go | 4 ++--
 cmd/kubeadm/kubeadm.go     | 2 --
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cmd/kubeadm/BUILD b/cmd/kubeadm/BUILD
index ba67e949278..c07a3d72d9b 100644
--- a/cmd/kubeadm/BUILD
+++ b/cmd/kubeadm/BUILD
@@ -18,10 +18,7 @@ go_library(
     name = "go_default_library",
     srcs = ["kubeadm.go"],
     importpath = "k8s.io/kubernetes/cmd/kubeadm",
-    deps = [
-        "//cmd/kubeadm/app:go_default_library",
-        "//vendor/k8s.io/klog:go_default_library",
-    ],
+    deps = ["//cmd/kubeadm/app:go_default_library"],
 )
 
 filegroup(
diff --git a/cmd/kubeadm/app/kubeadm.go b/cmd/kubeadm/app/kubeadm.go
index 34165f4727f..1842cfd8cb4 100644
--- a/cmd/kubeadm/app/kubeadm.go
+++ b/cmd/kubeadm/app/kubeadm.go
@@ -22,8 +22,7 @@ import (
 
 	"github.com/spf13/pflag"
 
-	// ensure libs have a chance to globally register their flags
-	_ "k8s.io/klog"
+	"k8s.io/klog"
 
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/kubernetes/cmd/kubeadm/app/cmd"
@@ -31,6 +30,7 @@ import (
 
 // Run creates and executes new kubeadm command
 func Run() error {
+	klog.InitFlags(nil)
 	pflag.CommandLine.SetNormalizeFunc(cliflag.WordSepNormalizeFunc)
 	pflag.CommandLine.AddGoFlagSet(flag.CommandLine)
 
diff --git a/cmd/kubeadm/kubeadm.go b/cmd/kubeadm/kubeadm.go
index ba4b34622ab..addfdb84f46 100644
--- a/cmd/kubeadm/kubeadm.go
+++ b/cmd/kubeadm/kubeadm.go
@@ -19,12 +19,10 @@ package main
 import (
 	"os"
 
-	"k8s.io/klog"
 	"k8s.io/kubernetes/cmd/kubeadm/app"
 )
 
 func main() {
-	klog.InitFlags(nil)
 	if err := app.Run(); err != nil {
 		os.Exit(1)
 	}