github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 15:13:08 +00:00
Code Issues Projects Releases Wiki Activity

Split controller manager options from init

Browse Source 
Make defaults and flags clearly distinct from initialization code.
This commit is contained in:
Clayton Coleman
2015-12-24 18:59:05 -05:00
parent ab6edd8170
commit 2326e2bae3
7 changed files with 214 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kube-controller-manager/controller-manager.go
View File

@@ -26,6 +26,7 @@ import (
"runtime"
"k8s.io/kubernetes/cmd/kube-controller-manager/app"
"k8s.io/kubernetes/cmd/kube-controller-manager/app/options"
"k8s.io/kubernetes/pkg/healthz"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version/verflag"
@@ -39,7 +40,7 @@ func init() {
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
s := app.NewCMServer()
s := options.NewCMServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
@@ -48,7 +49,7 @@ func main() {
verflag.PrintAndExitIfRequested()
if err := s.Run(pflag.CommandLine.Args()); err != nil {
if err := app.Run(s); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)
}