Skip to content

Commit

Permalink
fix related to the bump
Browse files Browse the repository at this point in the history
  • Loading branch information
chouetz committed Nov 18, 2024
1 parent 7e8fada commit 11b2344
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion test/new-e2e/pkg/environments/aws/kubernetes/kind.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/pkg/environments/local/kubernetes/kind.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion test/new-e2e/tests/orchestrator/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
3 changes: 2 additions & 1 deletion test/new-e2e/tests/orchestrator/k8s_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package orchestrator

import (
"fmt"
"strings"
"time"

Expand All @@ -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,
Expand Down

0 comments on commit 11b2344

Please sign in to comment.