Merge pull request #26961 from sttts/sttts-flake-26210-decouple-port-80

Automatic merge from submit-queue

Flake 26210: decouple explicit access from port 80

Flake #26210 only happens for port 80. To decouple the possible causes, all
tests with explicit port 80 are moved to port 1080 (these were 80% of the flakes).
The urls without a specified port (which map to port 80 though) are left untouched.

If port 1080 does not show up as flake now, there is really a connection to the
actual port number.

test/e2e/proxy.go

@@ -115,9 +115,10 @@ func proxyContext(version string) {
 			Replicas:     1,
 			PollInterval: time.Second,
 			Env: map[string]string{
-				"SERVE_PORT_80":  `<a href="/rewriteme">test</a>`,
-				"SERVE_PORT_160": "foo",
-				"SERVE_PORT_162": "bar",
+				"SERVE_PORT_80":   `<a href="/rewriteme">test</a>`,
+				"SERVE_PORT_1080": `<a href="/rewriteme">test</a>`,
+				"SERVE_PORT_160":  "foo",
+				"SERVE_PORT_162":  "bar",
 
 				"SERVE_TLS_PORT_443": `<a href="/tlsrewriteme">test</a>`,
 				"SERVE_TLS_PORT_460": `tls baz`,
@@ -184,21 +185,21 @@ func proxyContext(version string) {
 			subresourceServiceProxyURL("https", "tlsportname1") + "/": "tls baz",
 			subresourceServiceProxyURL("https", "tlsportname2") + "/": "tls qux",
 
-			podProxyURL("", "80") + "/":  `<a href="` + podProxyURL("", "80") + `/rewriteme">test</a>`,
-			podProxyURL("", "160") + "/": "foo",
-			podProxyURL("", "162") + "/": "bar",
-
-			podProxyURL("http", "80") + "/":  `<a href="` + podProxyURL("http", "80") + `/rewriteme">test</a>`,
-			podProxyURL("http", "160") + "/": "foo",
-			podProxyURL("http", "162") + "/": "bar",
-
-			subresourcePodProxyURL("", "") + "/":        `<a href="` + subresourcePodProxyURL("", "") + `/rewriteme">test</a>`,
-			subresourcePodProxyURL("", "80") + "/":      `<a href="` + subresourcePodProxyURL("", "80") + `/rewriteme">test</a>`,
-			subresourcePodProxyURL("http", "80") + "/":  `<a href="` + subresourcePodProxyURL("http", "80") + `/rewriteme">test</a>`,
-			subresourcePodProxyURL("", "160") + "/":     "foo",
-			subresourcePodProxyURL("http", "160") + "/": "foo",
-			subresourcePodProxyURL("", "162") + "/":     "bar",
-			subresourcePodProxyURL("http", "162") + "/": "bar",
+			podProxyURL("", "1080") + "/": `<a href="` + podProxyURL("", "1080") + `/rewriteme">test</a>`,
+			podProxyURL("", "160") + "/":  "foo",
+			podProxyURL("", "162") + "/":  "bar",
+
+			podProxyURL("http", "1080") + "/": `<a href="` + podProxyURL("http", "1080") + `/rewriteme">test</a>`,
+			podProxyURL("http", "160") + "/":  "foo",
+			podProxyURL("http", "162") + "/":  "bar",
+
+			subresourcePodProxyURL("", "") + "/":         `<a href="` + subresourcePodProxyURL("", "") + `/rewriteme">test</a>`,
+			subresourcePodProxyURL("", "1080") + "/":     `<a href="` + subresourcePodProxyURL("", "1080") + `/rewriteme">test</a>`,
+			subresourcePodProxyURL("http", "1080") + "/": `<a href="` + subresourcePodProxyURL("http", "1080") + `/rewriteme">test</a>`,
+			subresourcePodProxyURL("", "160") + "/":      "foo",
+			subresourcePodProxyURL("http", "160") + "/":  "foo",
+			subresourcePodProxyURL("", "162") + "/":      "bar",
+			subresourcePodProxyURL("http", "162") + "/":  "bar",
 
 			subresourcePodProxyURL("https", "443") + "/": `<a href="` + subresourcePodProxyURL("https", "443") + `/tlsrewriteme">test</a>`,
 			subresourcePodProxyURL("https", "460") + "/": "tls baz",