From 11b23448c8372e2316d729a6f23a4ceb104cf761 Mon Sep 17 00:00:00 2001
From: Nicolas Schweitzer <nicolas.schweitzer@datadoghq.com>
Date: Mon, 18 Nov 2024 22:33:33 +0100
Subject: [PATCH] fix related to the bump

---
 test/new-e2e/pkg/environments/aws/kubernetes/kind.go   | 2 +-
 test/new-e2e/pkg/environments/local/kubernetes/kind.go | 2 +-
 test/new-e2e/tests/orchestrator/apply.go               | 2 +-
 test/new-e2e/tests/orchestrator/k8s_test.go            | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/new-e2e/pkg/environments/aws/kubernetes/kind.go b/test/new-e2e/pkg/environments/aws/kubernetes/kind.go
index 58fce4c5a9132e..53bc559b4db0e7 100644
--- a/test/new-e2e/pkg/environments/aws/kubernetes/kind.go
+++ b/test/new-e2e/pkg/environments/aws/kubernetes/kind.go
@@ -88,7 +88,7 @@ func KindRunFunc(ctx *pulumi.Context, env *environments.Kubernetes, params *Prov
 		return err
 	}
 
-	kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, awsEnv.CommonNamer().ResourceName("kind"), params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
+	kindCluster, err := kubeComp.NewKindCluster(&awsEnv, host, params.name, awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
 	if err != nil {
 		return err
 	}
diff --git a/test/new-e2e/pkg/environments/local/kubernetes/kind.go b/test/new-e2e/pkg/environments/local/kubernetes/kind.go
index b8f76751dcf484..90234eaaee38ab 100644
--- a/test/new-e2e/pkg/environments/local/kubernetes/kind.go
+++ b/test/new-e2e/pkg/environments/local/kubernetes/kind.go
@@ -131,7 +131,7 @@ func KindRunFunc(ctx *pulumi.Context, env *environments.Kubernetes, params *Prov
 		return err
 	}
 
-	kindCluster, err := kubeComp.NewLocalKindCluster(&localEnv, localEnv.CommonNamer().ResourceName("kind"), params.name, localEnv.KubernetesVersion())
+	kindCluster, err := kubeComp.NewLocalKindCluster(&localEnv, params.name, localEnv.KubernetesVersion())
 	if err != nil {
 		return err
 	}
diff --git a/test/new-e2e/tests/orchestrator/apply.go b/test/new-e2e/tests/orchestrator/apply.go
index 1f1f90dc1dbd23..f7300ddc788334 100644
--- a/test/new-e2e/tests/orchestrator/apply.go
+++ b/test/new-e2e/tests/orchestrator/apply.go
@@ -67,7 +67,7 @@ func createCluster(ctx *pulumi.Context) (*resAws.Environment, *localKubernetes.C
 		return nil, nil, nil, err
 	}
 
-	kindCluster, err := localKubernetes.NewKindCluster(&awsEnv, vm, awsEnv.CommonNamer().ResourceName("kind"), "kind", awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
+	kindCluster, err := localKubernetes.NewKindCluster(&awsEnv, vm, "kind", awsEnv.KubernetesVersion(), utils.PulumiDependsOn(installEcrCredsHelperCmd))
 	if err != nil {
 		return nil, nil, nil, err
 	}
diff --git a/test/new-e2e/tests/orchestrator/k8s_test.go b/test/new-e2e/tests/orchestrator/k8s_test.go
index da82a20144f440..a38355d83b322d 100644
--- a/test/new-e2e/tests/orchestrator/k8s_test.go
+++ b/test/new-e2e/tests/orchestrator/k8s_test.go
@@ -6,6 +6,7 @@
 package orchestrator
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
@@ -32,7 +33,7 @@ func (suite *k8sSuite) TestNode() {
 	expectAtLeastOneResource{
 		filter: &fakeintake.PayloadFilter{ResourceType: agentmodel.TypeCollectorNode},
 		test: func(payload *aggregator.OrchestratorPayload) bool {
-			return payload.Node.Metadata.Name == "kind-control-plane"
+			return payload.Node.Metadata.Name == fmt.Sprintf("%s-control-plane", suite.KubeClusterName)
 		},
 		message: "find a control plane node",
 		timeout: defaultTimeout,