github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 13:03:43 +00:00
Code Issues Projects Releases Wiki Activity

Fix broken Mesos km due to too early proxy intitialization

Browse Source 
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
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/mesos/cmd/km/kube-proxy.go
View File

@ -18,9 +18,6 @@ limitations under the License.
package main package main
import ( import (
"fmt"
"os"
kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app" kubeproxy "k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/contrib/mesos/pkg/hyperkube" "k8s.io/kubernetes/contrib/mesos/pkg/hyperkube"
) )
@ -40,13 +37,13 @@ func NewKubeProxy() *Server {
} }
config.AddFlags(hks.Flags()) 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 { hks.Run = func(_ *Server, args []string) error {
s, err := kubeproxy.NewProxyServerDefault(config)
if err != nil {
return err
}
return s.Run(args) return s.Run(args)
} }