kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
minikube/hack/kube-proxy-patch.diff

14 lines
659 B
Diff
Raw Normal View History

add vendor
2017-10-02 18:52:09 +00:00
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
--- 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
Fix godep-* hack scripts for 1.7 * Added a godep-update-k8s script for upgrading. $ KUBE_VERSION ./hack/godeps/godep-update-k8s.sh * Added client-go version ldflags to localkube and minikube. The version package is now split in both kubernetes and client-go, so we need to supply both ldflags. * Change cross builds to use BUILD_IN_DOCKER * Add a patch for kube-proxy The setup of kube-proxy recently changed, making the registering of the component config a fatal error instead of a warning. This patch reverts it to be a warning, which is a no-op for us anyways since we don't supply a config file.
2017-06-28 18:18:58 +00:00
if c, err := configz.New("componentconfig"); err == nil {
c.Set(config)
} else {
- return nil, fmt.Errorf("unable to register configz: %s", err)
add vendor
2017-10-02 18:52:09 +00:00
+ glog.Warningf("unable to register configz: %s", err)
Fix godep-* hack scripts for 1.7 * Added a godep-update-k8s script for upgrading. $ KUBE_VERSION ./hack/godeps/godep-update-k8s.sh * Added client-go version ldflags to localkube and minikube. The version package is now split in both kubernetes and client-go, so we need to supply both ldflags. * Change cross builds to use BUILD_IN_DOCKER * Add a patch for kube-proxy The setup of kube-proxy recently changed, making the registering of the component config a fatal error instead of a warning. This patch reverts it to be a warning, which is a no-op for us anyways since we don't supply a config file.
2017-06-28 18:18:58 +00:00
}
protocol := utiliptables.ProtocolIpv4