@@ -167,9 +167,6 @@ func TestApply(t *testing.T) {
167
167
MachineDeploymentClass : & clusterv1.PatchSelectorMatchMachineDeploymentClass {
168
168
Names : []string {"default-worker" },
169
169
},
170
- MachinePoolClass : & clusterv1.PatchSelectorMatchMachinePoolClass {
171
- Names : []string {"default-mp-worker" },
172
- },
173
170
},
174
171
},
175
172
JSONPatches : []clusterv1.JSONPatch {
@@ -194,7 +191,7 @@ func TestApply(t *testing.T) {
194
191
{
195
192
Op : "add" ,
196
193
Path : "/spec/template/spec/resource" ,
197
- Value : & apiextensionsv1.JSON {Raw : []byte (`"default-worker-infra"` )},
194
+ Value : & apiextensionsv1.JSON {Raw : []byte (`"default-mp- worker-infra"` )},
198
195
},
199
196
},
200
197
},
@@ -212,7 +209,7 @@ func TestApply(t *testing.T) {
212
209
{
213
210
Op : "add" ,
214
211
Path : "/spec/template/spec/resource" ,
215
- Value : & apiextensionsv1.JSON {Raw : []byte (`"default-worker-bootstrap"` )},
212
+ Value : & apiextensionsv1.JSON {Raw : []byte (`"default-mp- worker-bootstrap"` )},
216
213
},
217
214
},
218
215
},
@@ -229,12 +226,12 @@ func TestApply(t *testing.T) {
229
226
"default-worker-topo2" : {"spec.template.spec.resource" : "default-worker-infra" },
230
227
},
231
228
machinePoolBootstrapConfig : map [string ]map [string ]interface {}{
232
- "default-mp-worker-topo1" : {"spec.resource" : "default-worker-bootstrap" },
233
- "default-mp-worker-topo2" : {"spec.resource" : "default-worker-bootstrap" },
229
+ "default-mp-worker-topo1" : {"spec.resource" : "default-mp- worker-bootstrap" },
230
+ "default-mp-worker-topo2" : {"spec.resource" : "default-mp- worker-bootstrap" },
234
231
},
235
232
machinePoolInfrastructureMachinePool : map [string ]map [string ]interface {}{
236
- "default-mp-worker-topo1" : {"spec.resource" : "default-worker-infra" },
237
- "default-mp-worker-topo2" : {"spec.resource" : "default-worker-infra" },
233
+ "default-mp-worker-topo1" : {"spec.resource" : "default-mp- worker-infra" },
234
+ "default-mp-worker-topo2" : {"spec.resource" : "default-mp- worker-infra" },
238
235
},
239
236
},
240
237
},
@@ -850,11 +847,11 @@ func TestApply(t *testing.T) {
850
847
"default-worker-topo2" : {"spec.template.spec.resource" : "default-worker-topo2" },
851
848
},
852
849
machinePoolInfrastructureMachinePool : map [string ]map [string ]interface {}{
853
- "default-mp-worker-topo1" : {"spec.resource" : "value1 " },
850
+ "default-mp-worker-topo1" : {"spec.resource" : "value2 " },
854
851
"default-mp-worker-topo2" : {"spec.resource" : "default-mp-worker-topo2" },
855
852
},
856
853
machinePoolBootstrapConfig : map [string ]map [string ]interface {}{
857
- "default-mp-worker-topo1" : {"spec.resource" : "value1 " },
854
+ "default-mp-worker-topo1" : {"spec.resource" : "value2 " },
858
855
"default-mp-worker-topo2" : {"spec.resource" : "default-mp-worker-topo2" },
859
856
},
860
857
},
@@ -1105,7 +1102,7 @@ func setupTestObjects() (*scope.ClusterBlueprint, *scope.ClusterState) {
1105
1102
{
1106
1103
Name : "default-mp-worker-infra" ,
1107
1104
DefinitionFrom : "inline" ,
1108
- Value : apiextensionsv1.JSON {Raw : []byte (`"value1 "` )},
1105
+ Value : apiextensionsv1.JSON {Raw : []byte (`"value2 "` )},
1109
1106
},
1110
1107
},
1111
1108
},
0 commit comments