github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-02 03:48:21 -07:00
parent 512f7c3e2c fd5ee2a9ea
commit b42942c8f4
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/hyperkube/kube-proxy.go
View File

@ -19,9 +19,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"
) )
@ -39,13 +36,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)
} }

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