Merge pull request #14660 from mesosphere/sttts-fix-broken-km-after-kubeproxy-refactoring

cmd/hyperkube/kube-proxy.go

@@ -19,9 +19,6 @@ limitations under the License.
 package main
 
 import (
-	"fmt"
-	"os"
-
 	kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
 )
 
@@ -39,13 +36,13 @@ func NewKubeProxy() *Server {
 	}
 
 	config.AddFlags(hks.Flags())
+
+	hks.Run = func(_ *Server, args []string) error {
 		s, err := kubeproxy.NewProxyServerDefault(config)
 		if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
+			return err
 		}
 
-	hks.Run = func(_ *Server, args []string) error {
 		return s.Run(args)
 	}
 

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())
+
+	hks.Run = func(_ *Server, args []string) error {
 		s, err := kubeproxy.NewProxyServerDefault(config)
 		if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-		os.Exit(1)
+			return err
 		}
 
-	hks.Run = func(_ *Server, args []string) error {
 		return s.Run(args)
 	}