Merge pull request #55817 from danehans/issue_55816

Automatic merge from submit-queue (batch tested with PRs 55757, 55741, 55817, 55834, 51530). 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>. Fixes Issue 55816: Removes unneeded IPPart error **What this PR does / why we need it**: Previously proxy was incorrectly logging an error message for the IPPart function. The PR fixes this logging behavior to only log `invalid IP part` for invalid IP:Port combinations. **Which issue(s) this PR fixes**: Fixes # https://github.com/kubernetes/kubernetes/issues/55816 **Special notes for your reviewer**: None **Release note**: ``` none ```

Merge pull request #55817 from danehans/issue_55816
c00500ee · Kubernetes Submit Queue · GitHub · 7910099e · 8deec6a7 · c00500ee
Unverified Commit c00500ee authored Nov 18, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 18, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

endpoints.go pkg/proxy/util/endpoints.go +2 -1

No files found.
--- a/pkg/proxy/util/endpoints.go
+++ b/pkg/proxy/util/endpoints.go
@@ -39,8 +39,9 @@ func IPPart(s string) string {
 	}
 	// Check if host string is a valid IP address
 	if ip := net.ParseIP(host); ip != nil {
+		return ip.String()
+	} else {
 		glog.Errorf("invalid IP part '%s'", host)
-		return host
 	}
 	return ""
 }