add multi-etcd support to testing framework

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

Author: xrstf

test/e2e/rootshards/rootshards_test.go

@@ -44,7 +44,7 @@ func TestCreateRootShard(t *testing.T) {
 	namespace := "create-rootshard"
 
 	utils.CreateSelfDestructingNamespace(t, ctx, client, namespace)
-	etcd := utils.DeployEtcd(t, namespace)
+	etcd := utils.DeployEtcd(t, "etcd", namespace)
 
 	rootShard := kcpoperatorv1alpha1.RootShard{}
 	rootShard.Name = "test"

test/utils/utils.go

@@ -210,13 +210,13 @@ func ConnectWithKubeconfig(
 	return kcpClient
 }
 
-func DeployEtcd(t *testing.T, namespace string) string {
+func DeployEtcd(t *testing.T, name, namespace string) string {
 	t.Helper()
 
-	t.Logf("Installing etcd into %s…", namespace)
+	t.Logf("Installing etcd %q into %s…", name, namespace)
 	args := []string{
 		"install",
-		"etcd",
+		name,
 		"oci://registry-1.docker.io/bitnamicharts/etcd",
 		"--namespace", namespace,
 		"--version", "10.7.1", // latest version at the time of writing
@@ -233,7 +233,7 @@ func DeployEtcd(t *testing.T, namespace string) string {
 		"wait",
 		"pods",
 		"--namespace", namespace,
-		"--selector", "app.kubernetes.io/name=etcd",
+		"--selector", fmt.Sprintf("app.kubernetes.io/name=etcd,app.kubernetes.io/instance=%s", name),
 		"--for", "condition=Ready",
 		"--timeout", "3m",
 	}
@@ -242,5 +242,5 @@ func DeployEtcd(t *testing.T, namespace string) string {
 		t.Fatalf("Failed to wait for etcd to become ready: %v", err)
 	}
 
-	return fmt.Sprintf("http://etcd.%s.svc.cluster.local:2379", namespace)
+	return fmt.Sprintf("http://%s.%s.svc.cluster.local:2379", name, namespace)
 }