From d5f725add7dd4c353814f1ea4303b3ffbe9ce257 Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Mon, 28 Sep 2015 18:52:25 +0200 Subject: [PATCH] Fix broken Mesos km due to too early proxy intitialization This was introduced in 1c25c2cd9954d2985d115e3dc876918222aff7db. --- contrib/mesos/cmd/km/kube-proxy.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/contrib/mesos/cmd/km/kube-proxy.go b/contrib/mesos/cmd/km/kube-proxy.go index eebe1f6e5a983..9d3fa82fb0cfd 100644 --- a/contrib/mesos/cmd/km/kube-proxy.go +++ b/contrib/mesos/cmd/km/kube-proxy.go @@ -18,9 +18,6 @@ limitations under the License. package main import ( - "fmt" - "os" - kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app" "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" ) @@ -40,13 +37,13 @@ func NewKubeProxy() *Server { } config.AddFlags(hks.Flags()) - s, err := kubeproxy.NewProxyServerDefault(config) - if err != nil { - fmt.Fprintf(os.Stderr, "%v\n", err) - os.Exit(1) - } hks.Run = func(_ *Server, args []string) error { + s, err := kubeproxy.NewProxyServerDefault(config) + if err != nil { + return err + } + return s.Run(args) }