Skip to content

Commit

Permalink
Fix broken Mesos km due to too early proxy intitialization
Browse files Browse the repository at this point in the history
This was introduced in 1c25c2c.
  • Loading branch information
sttts committed Sep 28, 2015
1 parent 5994e1d commit d5f725a
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions contrib/mesos/cmd/km/kube-proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -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)
}

Expand Down

0 comments on commit d5f725a

Please sign in to comment.