mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
kubeadm: move klog.InitFlags into app/kubeadm.go
This commit is contained in:
parent
932487c744
commit
7d5ece2e2c
@ -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(
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user