Merge pull request #79880 from SataQiu/clean-kubeadm-20190708

kubeadm: move klog.InitFlags into app/kubeadm.go
kubernetes · Jul 9, 2019 · b7faf3e · b7faf3e
2 parents f56cfbe + 7d5ece2
commit b7faf3e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -22,15 +22,15 @@ 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"
 )
 
 // 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
@@ -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)
 	}