Fix broken Mesos km due to too early proxy intitialization

This was introduced in 1c25c2cd99.
This commit is contained in:
Dr. Stefan Schimanski 2015-09-28 18:52:25 +02:00
parent 5994e1d425
commit d5f725add7

View File

@ -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)
}