Merge pull request #66358 from linyouchong/pr-0719-hostname

Automatic merge from submit-queue (batch tested with PRs 62444, 66358, 66724, 66726). 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>. GetMasterHost should not return port **What this PR does / why we need it**: masterUrl.Host may include port, e.g. 10.114.51.201:8443 GetMasterHost() should not return port **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 # **Special notes for your reviewer**: NONE **Release note**: ```release-note NONE ```

Merge pull request #66358 from linyouchong/pr-0719-hostname
2e03f49b · Kubernetes Submit Queue · GitHub · a8641258 · 5e77245b · 2e03f49b
Unverified Commit 2e03f49b authored Jul 27, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

util.go test/e2e/framework/util.go +1 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -272,7 +272,7 @@ type ContainerFailures struct {
 func GetMasterHost() string {
 	masterUrl, err := url.Parse(TestContext.Host)
 	ExpectNoError(err)
-	return masterUrl.Host
+	return masterUrl.Hostname()
 }

 func nowStamp() string {