Merge pull request kubernetes#83331 from aojea/getporturl_ipv6

k8s-ci-robot · web-flow · commit 8826378be53d · 2019-09-30T16:13:31.000-07:00
Allow ipv6 urls in GetPortURL()
diff --git a/test/e2e/framework/node/resource.go b/test/e2e/framework/node/resource.go
@@ -241,7 +241,8 @@ func GetPortURL(client clientset.Interface, ns, name string, svcPort int) (strin
 		for _, address := range node.Status.Addresses {
 			if address.Type == v1.NodeExternalIP {
 				if address.Address != "" {
-					return fmt.Sprintf("http://%v:%v", address.Address, nodePort), nil
+					host := net.JoinHostPort(address.Address, fmt.Sprint(nodePort))
+					return fmt.Sprintf("http://%s", host), nil
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,8 @@ func GetPortURL(client clientset.Interface, ns, name string, svcPort int) (strin`
`241`	`241`	`for _, address := range node.Status.Addresses {`
`242`	`242`	`if address.Type == v1.NodeExternalIP {`
`243`	`243`	`if address.Address != "" {`
`244`		`- return fmt.Sprintf("http://%v:%v", address.Address, nodePort), nil`
	`244`	`+ host := net.JoinHostPort(address.Address, fmt.Sprint(nodePort))`
	`245`	`+ return fmt.Sprintf("http://%s", host), nil`
`245`	`246`	`}`
`246`	`247`	`}`
`247`	`248`	`}`