Merge pull request kubernetes#55817 from danehans/issue_55816

Kubernetes Submit Queue · web-flow · commit c00500ee31be · 2017-11-18T16:38:30.000-08:00
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 # kubernetes#55816 **Special notes for your reviewer**: None **Release note**: ``` none ```
diff --git 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 ""
 }

Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,9 @@ func IPPart(s string) string {`
`39`	`39`	`}`
`40`	`40`	`// Check if host string is a valid IP address`
`41`	`41`	`if ip := net.ParseIP(host); ip != nil {`
	`42`	`+ return ip.String()`
	`43`	`+ } else {`
`42`	`44`	`glog.Errorf("invalid IP part '%s'", host)`
`43`		`- return host`
`44`	`45`	`}`
`45`	`46`	`return ""`
`46`	`47`	`}`