From 84a37e9a149dbd7aa2f4852a0491cf5b23035493 Mon Sep 17 00:00:00 2001 From: dlorenc Date: Tue, 19 Dec 2017 10:02:14 -0800 Subject: [PATCH] More manual changes. --- pkg/localkube/proxy.go | 1 + pkg/localkube/scheduler.go | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pkg/localkube/proxy.go b/pkg/localkube/proxy.go index b6bac05c1d40..e617ad79a11b 100644 --- a/pkg/localkube/proxy.go +++ b/pkg/localkube/proxy.go @@ -66,6 +66,7 @@ func StartProxyServer(lk LocalkubeServer) func() error { if err != nil { panic(err) } + opts.SetConfig(config) lk.SetExtraConfigForComponent("proxy", &config) diff --git a/pkg/localkube/scheduler.go b/pkg/localkube/scheduler.go index 0ab60ca6e625..6fda922593d6 100644 --- a/pkg/localkube/scheduler.go +++ b/pkg/localkube/scheduler.go @@ -27,7 +27,15 @@ func (lk LocalkubeServer) NewSchedulerServer() Server { } func StartSchedulerServer(lk LocalkubeServer) func() error { - config := componentconfig.KubeSchedulerConfiguration{} + config := &componentconfig.KubeSchedulerConfiguration{} + opts, err := scheduler.NewOptions() + if err != nil { + panic(err) + } + config, err = opts.ApplyDefaults(config) + if err != nil { + panic(err) + } // master details config.ClientConnection.KubeConfigFile = util.DefaultKubeConfigPath @@ -38,7 +46,7 @@ func StartSchedulerServer(lk LocalkubeServer) func() error { lk.SetExtraConfigForComponent("scheduler", &config) return func() error { - s, err := scheduler.NewSchedulerServer(&config, "") + s, err := scheduler.NewSchedulerServer(config, "") if err != nil { return err }