mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
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 ```
This commit is contained in:
commit
2e03f49bd0
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user