github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
kubeadm: move klog.InitFlags into app/kubeadm.go
This commit is contained in:
Kubernetes Prow Robot 2019-07-09 10:12:42 -07:00 committed by GitHub
commit b7faf3ef76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kubeadm/BUILD
View File

@ -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(

4
cmd/kubeadm/app/kubeadm.go
View File

@ -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)

2
cmd/kubeadm/kubeadm.go
View File

@ -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)
}