Skip to content

Commit 21d3c7b

Browse files
authored
Merge pull request kubernetes-sigs#9464 from sbueringer/pr-cc-mp-engine-tests-fixup
🌱 Fix some nits in Cluster topology engine tests
2 parents a72e539 + 5fd8f3d commit 21d3c7b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

internal/controllers/topology/cluster/patches/engine_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ func TestApply(t *testing.T) {
866866
// * A ClusterClass with its corresponding templates:
867867
// * ControlPlaneTemplate with a corresponding ControlPlane InfrastructureMachineTemplate.
868868
// * MachineDeploymentClass "default-worker" with corresponding BootstrapTemplate and InfrastructureMachineTemplate.
869-
// * MachinePoolClass "default-mp-worker" with corresponding BootstrapTemplate and InfrastructureMachineTemplate.
869+
// * MachinePoolClass "default-mp-worker" with corresponding BootstrapTemplate and InfrastructureMachinePoolTemplate.
870870
// * The corresponding Cluster.spec.topology:
871871
// * with 3 ControlPlane replicas
872872
// * with a "default-worker-topo1" MachineDeploymentTopology without replicas (based on "default-worker")
@@ -988,13 +988,13 @@ func setupTestObjects() (*scope.ClusterBlueprint, *scope.ClusterState) {
988988

989989
workerInfrastructureMachineTemplate := builder.InfrastructureMachineTemplate(metav1.NamespaceDefault, "linux-worker-inframachinetemplate").
990990
Build()
991-
workerInfrastructureMachinePoolTemplate := builder.InfrastructureMachinePoolTemplate(metav1.NamespaceDefault, "linux-worker-inframachinetemplate").
991+
workerInfrastructureMachinePoolTemplate := builder.InfrastructureMachinePoolTemplate(metav1.NamespaceDefault, "linux-worker-inframachinepooltemplate").
992992
Build()
993-
workerInfrastructureMachinePool := builder.InfrastructureMachinePool(metav1.NamespaceDefault, "linux-worker-inframachinetemplate").
993+
workerInfrastructureMachinePool := builder.InfrastructureMachinePool(metav1.NamespaceDefault, "linux-worker-inframachinepool").
994994
Build()
995-
workerBootstrapTemplate := builder.BootstrapTemplate(metav1.NamespaceDefault, "linux-worker-bootstraptemplate").
995+
workerBootstrapTemplate := builder.BootstrapTemplate(metav1.NamespaceDefault, "linux-worker-bootstrapconfigtemplate").
996996
Build()
997-
workerBootstrapConfig := builder.BootstrapConfig(metav1.NamespaceDefault, "linux-worker-bootstraptemplate").
997+
workerBootstrapConfig := builder.BootstrapConfig(metav1.NamespaceDefault, "linux-worker-bootstrapconfig").
998998
Build()
999999
mdClass1 := builder.MachineDeploymentClass("default-worker").
10001000
WithInfrastructureTemplate(workerInfrastructureMachineTemplate).
@@ -1064,7 +1064,7 @@ func setupTestObjects() (*scope.ClusterBlueprint, *scope.ClusterState) {
10641064
},
10651065
{
10661066
Name: "default-mp-worker-infra",
1067-
// This value should be overwritten for the default-mp-worker-topo1 MachineDeployment.
1067+
// This value should be overwritten for the default-mp-worker-topo1 MachinePool.
10681068
Value: apiextensionsv1.JSON{Raw: []byte(`"default-mp-worker-topo2"`)},
10691069
DefinitionFrom: "inline",
10701070
},

0 commit comments

Comments
 (0)