fix tests, make them flake much, much less

On-behalf-of: @SAP [email protected]

Author: xrstf

go.mod

@@ -36,6 +36,7 @@ require (
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fatih/color v1.17.0 // indirect

go.sum

@@ -21,6 +21,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca h1:7oodhZp9MZW0DBkrZXyUsJWKQFy35SVxjZ8K4vHXnk8=
+github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca/go.mod h1:UhMFM+dnOcm1f0Pve8uqRaxAhEYki+/CuA2BTDp2T04=
 github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
 github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
 github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=

test/e2e/rootshards/proxy_test.go

@@ -47,7 +47,7 @@ func TestRootShardProxy(t *testing.T) {
 	ctx := context.Background()
 
 	namespace := utils.CreateSelfDestructingNamespace(t, ctx, client, "rootshard-proxy")
-	externalHostname := fmt.Sprintf("front-proxy-front-proxy.e2e-%s.svc.cluster.local", namespace.Name)
+	externalHostname := fmt.Sprintf("front-proxy-front-proxy.%s.svc.cluster.local", namespace.Name)
 
 	// deploy a root shard incl. etcd
 	rootShard := utils.DeployRootShard(ctx, t, client, namespace.Name, externalHostname)

test/utils/utils.go

@@ -30,6 +30,7 @@ import (
 
 	kcpcorev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1"
 	kcptenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1"
+	"github.com/kcp-dev/kcp/sdk/testing/server"
 	"github.com/kcp-dev/logicalcluster/v3"
 
 	corev1 "k8s.io/api/core/v1"
@@ -155,13 +156,18 @@ func SelfDestuctingPortForward(
 	})
 }
 
-var currentPort = 56029
+func getPort(t *testing.T) int {
+	port, err := server.GetFreePort(t)
+	if err != nil {
+		t.Fatalf("Failed to get free port: %v", err)
+	}
 
-func getPort() int {
-	port := currentPort
-	currentPort++
+	portNum, err := strconv.Atoi(port)
+	if err != nil {
+		t.Fatalf("Failed to parse port %q as number: %v", port, err)
+	}
 
-	return port
+	return portNum
 }
 
 func ConnectWithKubeconfig(
@@ -214,7 +220,7 @@ func ConnectWithKubeconfig(
 	}
 
 	// start a port forwarding
-	localPort := getPort()
+	localPort := getPort(t)
 	SelfDestuctingPortForward(t, ctx, namespace, "svc/"+serviceName, int(portNum), localPort)
 
 	// patch the target server
@@ -256,7 +262,7 @@ func ConnectWithRootShardProxy(
 	}
 
 	// start a port forwarding
-	localPort := getPort()
+	localPort := getPort(t)
 	servicePort := 6443
 	serviceName := resources.GetRootShardProxyServiceName(rootShard)