test(e2e): allocate new port for ZoneIngress in different cluster (backport of #16290) (#16385)

Automatic cherry-pick of #16290 for branch release-2.12

Generated by
[action](https://github.com/kumahq/kuma/actions/runs/24889901845)

cherry-picked commit 5ccb167

⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking!
⚠️ ⚠️ ⚠️
```
On branch release-2.12
Your branch is up to date with 'origin/release-2.12'.

You are currently cherry-picking commit 5ccb167.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/e2e_env/multizone/connectivity/available_services.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/framework/setup.go

```

> Changelog: skip

---------

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
Co-authored-by: Lukasz Dziedziak <lukidzi@gmail.com>

Author: kumahq[bot]

test/e2e_env/multizone/connectivity/available_services.go

@@ -22,6 +22,7 @@ func AvailableServices() {
 	meshName := "available-services"
 
 	var statefulCluster *UniversalCluster
+	var ingress1Port, ingress2Port int
 
 	BeforeAll(func() {
 		Expect(NewClusterSetup().
@@ -35,6 +36,8 @@ func AvailableServices() {
 			Setup(multizone.UniZone1)
 		Expect(err).ToNot(HaveOccurred())
 
+		ingress1Port = AllocateIngressPort()
+		ingress2Port = AllocateIngressPort()
 		statefulCluster = NewUniversalCluster(NewTestingT(), statefulClusterName, Silent)
 		Expect(postgres.Install(statefulClusterName)(statefulCluster)).To(Succeed())
 		err = NewClusterSetup().
@@ -44,8 +47,8 @@ func AvailableServices() {
 				WithPostgres(postgres.From(statefulCluster, statefulClusterName).GetEnvVars()),
 				WithEnv("KUMA_METRICS_DATAPLANE_IDLE_TIMEOUT", "10s"),
 			)).
-			Install(MultipleIngressUniversal(UniversalZoneIngressPort, multizone.Global.GetKuma().GenerateZoneIngressToken)).
-			Install(MultipleIngressUniversal(UniversalZoneIngressPort+1, multizone.Global.GetKuma().GenerateZoneIngressToken)).
+			Install(MultipleIngressUniversal(ingress1Port, fmt.Sprintf("%s-%d", AppIngress, ingress1Port), multizone.Global.GetKuma().GenerateZoneIngressToken)).
+			Install(MultipleIngressUniversal(ingress2Port, fmt.Sprintf("%s-%d", AppIngress, ingress2Port), multizone.Global.GetKuma().GenerateZoneIngressToken)).
 			Install(TestServerUniversal("test-server", meshName, WithArgs([]string{"echo", "--instance", "uni-test-server"}))).
 			Setup(statefulCluster)
 		Expect(err).ToNot(HaveOccurred())
@@ -81,19 +84,19 @@ func AvailableServices() {
 		kumactl := statefulCluster.GetKumactlOptions()
 
 		Consistently(func(g Gomega) {
-			ingress := getIngress(g, kumactl, UniversalZoneIngressPort)
+			ingress := getIngress(g, kumactl, ingress1Port)
 			g.Expect(ingress.GetAvailableServices()).To(HaveLen(1))
 		}).Should(Succeed())
 
 		Consistently(func(g Gomega) {
-			ingress := getIngress(g, kumactl, UniversalZoneIngressPort+1)
+			ingress := getIngress(g, kumactl, ingress2Port)
 			g.Expect(ingress.GetAvailableServices()).To(HaveLen(1))
 		}).Should(Succeed())
 
 		// Kill ingress
 		Expect(statefulCluster.GetApp(AppModeCP).KillMainApp()).To(Succeed())
 		// Kill CP
-		Expect(statefulCluster.DeleteApp(fmt.Sprintf("%s-%d", AppIngress, UniversalZoneIngressPort))).To(Succeed())
+		Expect(statefulCluster.DeleteApp(fmt.Sprintf("%s-%d", AppIngress, ingress1Port))).To(Succeed())
 		// Bring back CP
 		Expect(statefulCluster.GetApp(AppModeCP).StartMainApp()).To(Succeed())
 		// Kill app
@@ -103,12 +106,12 @@ func AvailableServices() {
 		}).Should(Succeed())
 
 		Eventually(func(g Gomega) {
-			ingress := getIngress(g, kumactl, UniversalZoneIngressPort+1)
+			ingress := getIngress(g, kumactl, ingress2Port)
 			g.Expect(ingress.GetAvailableServices()).To(BeEmpty())
 		}, "30s", "3s").Should(Succeed())
 
 		Eventually(func(g Gomega) {
-			ingress := getIngress(g, kumactl, UniversalZoneIngressPort)
+			ingress := getIngress(g, kumactl, ingress1Port)
 			g.Expect(ingress.GetAvailableServices()).To(BeEmpty())
 		}, "30s", "3s").Should(Succeed())
 	})

test/framework/setup.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	"github.com/gruntwork-io/terratest/modules/k8s"
@@ -665,7 +666,7 @@ func universalZoneProxyRelatedResource(
 	tokenProvider func(zone string) (string, error),
 	dpName string,
 	appType AppMode,
-	resourceManifestFunc func(address string, port int) string,
+	resourceManifestFunc func(address string) string,
 	concurrency int,
 ) func(cluster Cluster) error {
 	return func(cluster Cluster) error {
@@ -696,8 +697,7 @@ func universalZoneProxyRelatedResource(
 
 		uniCluster.apps[dpName] = app
 		publicAddress := app.GetIP()
-		dpYAML := resourceManifestFunc(publicAddress, UniversalZoneIngressPort)
-
+		dpYAML := resourceManifestFunc(publicAddress)
 		token, err := tokenProvider(uniCluster.name)
 		if err != nil {
 			return err
@@ -714,21 +714,28 @@ func universalZoneProxyRelatedResource(
 	}
 }
 
-func IngressUniversal(tokenProvider func(zone string) (string, error), opt ...AppDeploymentOption) InstallFunc {
-	manifestFunc := func(address string, port int) string {
-		return fmt.Sprintf(ZoneIngress, AppIngress, address, UniversalZoneIngressPort, port)
-	}
+// ingressPortAllocator hands out unique advertised ports for universal ZoneIngress
+// instances so that no two ingresses share the same IP:port when running in a
+// Docker/k3d environment where all zones resolve to the same host address.
+var ingressPortAllocator atomic.Int32
 
-	var opts appDeploymentOptions
-	opts.apply(opt...)
+func init() {
+	ingressPortAllocator.Store(int32(UniversalZoneIngressPort) - 1)
+}
 
-	return universalZoneProxyRelatedResource(tokenProvider, AppIngress, AppIngress, manifestFunc, opts.concurrency)
+// AllocateIngressPort returns the next unique advertised port for a universal
+// ZoneIngress. It is safe to call from multiple goroutines.
+func AllocateIngressPort() int {
+	return int(ingressPortAllocator.Add(1))
+}
+
+func IngressUniversal(tokenProvider func(zone string) (string, error), opt ...AppDeploymentOption) InstallFunc {
+	return MultipleIngressUniversal(AllocateIngressPort(), AppIngress, tokenProvider, opt...)
 }
 
-func MultipleIngressUniversal(advertisedPort int, tokenProvider func(zone string) (string, error), opt ...AppDeploymentOption) InstallFunc {
-	name := fmt.Sprintf("%s-%d", AppIngress, advertisedPort)
-	manifestFunc := func(address string, port int) string {
-		return fmt.Sprintf(ZoneIngress, name, address, advertisedPort, port)
+func MultipleIngressUniversal(advertisedPort int, name string, tokenProvider func(zone string) (string, error), opt ...AppDeploymentOption) InstallFunc {
+	manifestFunc := func(address string) string {
+		return fmt.Sprintf(ZoneIngress, name, address, advertisedPort, advertisedPort)
 	}
 
 	var opts appDeploymentOptions
@@ -738,8 +745,8 @@ func MultipleIngressUniversal(advertisedPort int, tokenProvider func(zone string
 }
 
 func EgressUniversal(tokenProvider func(zone string) (string, error), opt ...AppDeploymentOption) InstallFunc {
-	manifestFunc := func(_ string, port int) string {
-		return fmt.Sprintf(ZoneEgress, port)
+	manifestFunc := func(_ string) string {
+		return fmt.Sprintf(ZoneEgress, UniversalZoneIngressPort)
 	}
 
 	var opts appDeploymentOptions