Merge pull request #2690 from jwendell/fix-ipv6

Fix a conformance test when running on ipv6

Author: k8s-ci-robot

conformance/tests/mesh-frontend.go

@@ -59,7 +59,7 @@ var MeshFrontend = suite.ConformanceTest{
 			{
 				TestCaseName: "Send to pod IP",
 				Request: http.Request{
-					Host:   v2.Address + ":8080",
+					Host:   http.Ipv6SafeHost(v2.Address) + ":8080",
 					Method: "GET",
 				},
 				Response: http.Response{

conformance/utils/http/http.go

@@ -167,19 +167,19 @@ func CalculateHost(t *testing.T, gwAddr, scheme string) string {
 		return gwAddr
 	}
 	if strings.ToLower(scheme) == "http" && port == "80" {
-		return ipv6SafeHost(host)
+		return Ipv6SafeHost(host)
 	}
 	if strings.ToLower(scheme) == "https" && port == "443" {
-		return ipv6SafeHost(host)
+		return Ipv6SafeHost(host)
 	}
 	return gwAddr
 }
 
-func ipv6SafeHost(host string) string {
-	// We assume that host is a literal IPv6 address if host has
-	// colons.
-	// Per https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2.
-	// This is like net.JoinHostPort, but we don't need a port.
+// Ipv6SafeHost returns a safe representation for an ipv6 address to be used with a port
+// We assume that host is a literal IPv6 address if host has colons.
+// Per https://datatracker.ietf.org/doc/html/rfc3986#section-3.2.2.
+// This is like net.JoinHostPort, but we don't need a port.
+func Ipv6SafeHost(host string) string {
 	if strings.Contains(host, ":") {
 		return "[" + host + "]"
 	}