scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 10:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split proxy and scheduler arguments

Browse Source 
Keep options and flags distinct from initialization
This commit is contained in:
Clayton Coleman
2015-12-24 19:27:57 -05:00
parent b1e4831265
commit 715b77cbcd
11 changed files with 215 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/hyperkube/kube-proxy.go
View File

@@ -19,13 +19,14 @@ limitations under the License.
package main
import (
kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app/options"
)
// NewKubeProxy creates a new hyperkube Server object that includes the
// description and flags.
func NewKubeProxy() *Server {
config := kubeproxy.NewProxyConfig()
config := options.NewProxyConfig()
hks := Server{
SimpleUsage: "proxy",
@@ -37,13 +38,13 @@ func NewKubeProxy() *Server {
config.AddFlags(hks.Flags())
hks.Run = func(_ *Server, args []string) error {
s, err := kubeproxy.NewProxyServerDefault(config)
hks.Run = func(_ *Server, _ []string) error {
s, err := app.NewProxyServerDefault(config)
if err != nil {
return err
}
return s.Run(args)
return s.Run()
}
return &hks

9
cmd/hyperkube/kube-scheduler.go
View File

@@ -19,19 +19,20 @@ limitations under the License.
package main
import (
scheduler "k8s.io/kubernetes/plugin/cmd/kube-scheduler/app"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app"
"k8s.io/kubernetes/plugin/cmd/kube-scheduler/app/options"
)
// NewScheduler creates a new hyperkube Server object that includes the
// description and flags.
func NewScheduler() *Server {
s := scheduler.NewSchedulerServer()
s := options.NewSchedulerServer()
hks := Server{
SimpleUsage: "scheduler",
Long: "Implements a Kubernetes scheduler. This will assign pods to kubelets based on capacity and constraints.",
Run: func(_ *Server, args []string) error {
return s.Run(args)
Run: func(_ *Server, _ []string) error {
return app.Run(s)
},
}
s.AddFlags(hks.Flags())