From 8a19e676ddc4c42e243f57c81e60184f7a4ffd94 Mon Sep 17 00:00:00 2001 From: dlorenc Date: Tue, 19 Dec 2017 08:50:20 -0800 Subject: [PATCH] Fix kube-proxy patch. --- hack/kube-proxy-patch.diff | 6 +++--- .../k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/kube-proxy-patch.diff b/hack/kube-proxy-patch.diff index b58441a0e3..29c67fc1fd 100644 --- a/hack/kube-proxy-patch.diff +++ b/hack/kube-proxy-patch.diff @@ -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 -index b0f0eace5..02b631fb6 100644 +index 380e83e2a..51bb09fd0 100644 --- a/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 - if c, err := configz.New("componentconfig"); err == nil { +@@ -72,7 +72,7 @@ func newProxyServer( + if c, err := configz.New(proxyconfigapi.GroupName); err == nil { c.Set(config) } else { - return nil, fmt.Errorf("unable to register configz: %s", err) 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 380e83e2a0..51bb09fd01 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-proxy/app/server_others.go @@ -72,7 +72,7 @@ func newProxyServer( if c, err := configz.New(proxyconfigapi.GroupName); err == nil { c.Set(config) } else { - return nil, fmt.Errorf("unable to register configz: %s", err) + glog.Warningf("unable to register configz: %s", err) } protocol := utiliptables.ProtocolIpv4