Merge pull request #64999 from islinwb/nodeip_ipv6

Automatic merge from submit-queue (batch tested with PRs 66136, 64999, 65425, 66120, 66074). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Get ipv6 nodeIP when in ipv6 cluster **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #64985 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #64999 from islinwb/nodeip_ipv6
a54d7c6d · Kubernetes Submit Queue · GitHub · 10007ec8 · 69398f84 · a54d7c6d
Unverified Commit a54d7c6d authored Jul 12, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

server_others.go cmd/kube-proxy/app/server_others.go +5 -5

No files found.
--- a/cmd/kube-proxy/app/server_others.go
+++ b/cmd/kube-proxy/app/server_others.go
@@ -136,12 +136,12 @@ func newProxyServer(
 	var endpointsEventHandler proxyconfig.EndpointsHandler

 	proxyMode := getProxyMode(string(config.Mode), iptInterface, kernelHandler, ipsetInterface, iptables.LinuxKernelCompatTester{})
+	nodeIP := net.ParseIP(config.BindAddress)
+	if nodeIP.IsUnspecified() {
+		nodeIP = getNodeIP(client, hostname)
+	}
 	if proxyMode == proxyModeIPTables {
 		glog.V(0).Info("Using iptables Proxier.")
-		nodeIP := net.ParseIP(config.BindAddress)
-		if nodeIP.Equal(net.IPv4zero) || nodeIP.Equal(net.IPv6zero) {
-			nodeIP = getNodeIP(client, hostname)
-		}
 		if config.IPTables.MasqueradeBit == nil {
 			// MasqueradeBit must be specified or defaulted.
 			return nil, fmt.Errorf("unable to read IPTables MasqueradeBit from config")
@@ -194,7 +194,7 @@ func newProxyServer(
 			int(*config.IPTables.MasqueradeBit),
 			config.ClusterCIDR,
 			hostname,
-			getNodeIP(client, hostname),
+			nodeIP,
 			recorder,
 			healthzServer,
 			config.IPVS.Scheduler,