Use KubeletConfig.Builder in Mesos executor

10f9a975 · Dr. Stefan Schimanski · df5e9f8a · 10f9a975
Commit 10f9a975 authored Sep 23, 2015 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

service.go contrib/mesos/pkg/executor/service/service.go +4 -2

No files found.
--- a/contrib/mesos/pkg/executor/service/service.go
+++ b/contrib/mesos/pkg/executor/service/service.go
@@ -215,9 +215,11 @@ func (s *KubeletExecutorServer) Run(hks hyperkube.Interface, _ []string) error {

 	kcfg.NodeName = kcfg.Hostname

-	err = app.RunKubelet(&kcfg, app.KubeletBuilder(func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) {
+	kcfg.Builder = app.KubeletBuilder(func(kc *app.KubeletConfig) (app.KubeletBootstrap, *kconfig.PodConfig, error) {
 		return s.createAndInitKubelet(kc, hks, clientConfig)
-	}))
+	})
+
+	err = app.RunKubelet(&kcfg)
 	if err != nil {
 		return err
 	}