Split the Kubelet flag options and struct

Reduces the size of the app/server.go file and ensures that the flags
and their defaults are clearly separated.
This commit is contained in:
Clayton Coleman
2015-12-24 18:46:56 -05:00
parent b1e4831265
commit 791d160b42
21 changed files with 410 additions and 358 deletions

View File

@@ -25,7 +25,8 @@ import (
"os"
"runtime"
kubeletapp "k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/cmd/kubelet/app"
"k8s.io/kubernetes/cmd/kubelet/app/options"
"k8s.io/kubernetes/pkg/util"
"k8s.io/kubernetes/pkg/version/verflag"
@@ -34,7 +35,7 @@ import (
func main() {
runtime.GOMAXPROCS(runtime.NumCPU())
s := kubeletapp.NewKubeletServer()
s := options.NewKubeletServer()
s.AddFlags(pflag.CommandLine)
util.InitFlags()
@@ -43,7 +44,7 @@ func main() {
verflag.PrintAndExitIfRequested()
if err := s.Run(nil); err != nil {
if err := app.Run(s, nil); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1)
}