kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix kube-proxy patch.

pull/2355/head
dlorenc 2017-12-19 08:50:20 -08:00 committed by dlorenc
parent 6b169daa45
commit 8a19e676dd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hack/kube-proxy-patch.diff
View File

@ -1,9 +1,9 @@
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go diff --git a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
index b0f0eace5..02b631fb6 100644 index 380e83e2a..51bb09fd0 100644
--- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go --- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
+++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go
@@ -60,7 +60,7 @@ func NewProxyServer(config *componentconfig.KubeProxyConfiguration, cleanupAndEx @@ -72,7 +72,7 @@ func newProxyServer(
if c, err := configz.New("componentconfig"); err == nil { if c, err := configz.New(proxyconfigapi.GroupName); err == nil {
c.Set(config) c.Set(config)
} else { } else {
- return nil, fmt.Errorf("unable to register configz: %s", err) - return nil, fmt.Errorf("unable to register configz: %s", err)

2
vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go generated vendored
View File

@ -72,7 +72,7 @@ func newProxyServer(
if c, err := configz.New(proxyconfigapi.GroupName); err == nil { if c, err := configz.New(proxyconfigapi.GroupName); err == nil {
c.Set(config) c.Set(config)
} else { } else {
return nil, fmt.Errorf("unable to register configz: %s", err) glog.Warningf("unable to register configz: %s", err)
} }
protocol := utiliptables.ProtocolIpv4 protocol := utiliptables.ProtocolIpv4