From 7a2295d35675dbebcb41343c676dc3fda8cadcc1 Mon Sep 17 00:00:00 2001 From: Johannes Frey Date: Wed, 6 Sep 2023 07:39:58 +0200 Subject: [PATCH] Apply suggestions from code review --- .../topology/cluster/patches/engine_test.go | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/internal/controllers/topology/cluster/patches/engine_test.go b/internal/controllers/topology/cluster/patches/engine_test.go index 4b7d432b94a3..642525a6515b 100644 --- a/internal/controllers/topology/cluster/patches/engine_test.go +++ b/internal/controllers/topology/cluster/patches/engine_test.go @@ -167,9 +167,6 @@ func TestApply(t *testing.T) { MachineDeploymentClass: &clusterv1.PatchSelectorMatchMachineDeploymentClass{ Names: []string{"default-worker"}, }, - MachinePoolClass: &clusterv1.PatchSelectorMatchMachinePoolClass{ - Names: []string{"default-mp-worker"}, - }, }, }, JSONPatches: []clusterv1.JSONPatch{ @@ -194,7 +191,7 @@ func TestApply(t *testing.T) { { Op: "add", Path: "/spec/template/spec/resource", - Value: &apiextensionsv1.JSON{Raw: []byte(`"default-worker-infra"`)}, + Value: &apiextensionsv1.JSON{Raw: []byte(`"default-mp-worker-infra"`)}, }, }, }, @@ -212,7 +209,7 @@ func TestApply(t *testing.T) { { Op: "add", Path: "/spec/template/spec/resource", - Value: &apiextensionsv1.JSON{Raw: []byte(`"default-worker-bootstrap"`)}, + Value: &apiextensionsv1.JSON{Raw: []byte(`"default-mp-worker-bootstrap"`)}, }, }, }, @@ -229,12 +226,12 @@ func TestApply(t *testing.T) { "default-worker-topo2": {"spec.template.spec.resource": "default-worker-infra"}, }, machinePoolBootstrapConfig: map[string]map[string]interface{}{ - "default-mp-worker-topo1": {"spec.resource": "default-worker-bootstrap"}, - "default-mp-worker-topo2": {"spec.resource": "default-worker-bootstrap"}, + "default-mp-worker-topo1": {"spec.resource": "default-mp-worker-bootstrap"}, + "default-mp-worker-topo2": {"spec.resource": "default-mp-worker-bootstrap"}, }, machinePoolInfrastructureMachinePool: map[string]map[string]interface{}{ - "default-mp-worker-topo1": {"spec.resource": "default-worker-infra"}, - "default-mp-worker-topo2": {"spec.resource": "default-worker-infra"}, + "default-mp-worker-topo1": {"spec.resource": "default-mp-worker-infra"}, + "default-mp-worker-topo2": {"spec.resource": "default-mp-worker-infra"}, }, }, }, @@ -850,11 +847,11 @@ func TestApply(t *testing.T) { "default-worker-topo2": {"spec.template.spec.resource": "default-worker-topo2"}, }, machinePoolInfrastructureMachinePool: map[string]map[string]interface{}{ - "default-mp-worker-topo1": {"spec.resource": "value1"}, + "default-mp-worker-topo1": {"spec.resource": "value2"}, "default-mp-worker-topo2": {"spec.resource": "default-mp-worker-topo2"}, }, machinePoolBootstrapConfig: map[string]map[string]interface{}{ - "default-mp-worker-topo1": {"spec.resource": "value1"}, + "default-mp-worker-topo1": {"spec.resource": "value2"}, "default-mp-worker-topo2": {"spec.resource": "default-mp-worker-topo2"}, }, }, @@ -1105,7 +1102,7 @@ func setupTestObjects() (*scope.ClusterBlueprint, *scope.ClusterState) { { Name: "default-mp-worker-infra", DefinitionFrom: "inline", - Value: apiextensionsv1.JSON{Raw: []byte(`"value1"`)}, + Value: apiextensionsv1.JSON{Raw: []byte(`"value2"`)}, }, }, },