Skip to content

Commit 30c05aa

Browse files
vr4mantavr4manta
committed
Fixed unit tests after go.mod updates
1 parent 279e14c commit 30c05aa

File tree

2 files changed

+56
-16
lines changed

2 files changed

+56
-16
lines changed

‎pkg/webhooks/machine_webhook_test.go‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ func TestMachineCreation(t *testing.T) {
317317
expectedError: "",
318318
},
319319
{
320-
name: "configure host affinity with Host ID",
320+
name: "configure host placement with AnyAvailable affinity",
321321
platformType: osconfigv1.AWSPlatformType,
322322
clusterID: "aws-cluster",
323323
providerSpecValue: &kruntime.RawExtension{
@@ -326,14 +326,15 @@ func TestMachineCreation(t *testing.T) {
326326
ID: ptr.To[string]("ami"),
327327
},
328328
InstanceType: "test",
329-
HostAffinity: ptr.To(machinev1beta1.HostAffinityAnyAvailable),
330-
HostID: ptr.To("h-09dcf61cb388b0149"),
329+
HostPlacement: &machinev1beta1.HostPlacement{
330+
Affinity: ptr.To(machinev1beta1.HostAffinityAnyAvailable),
331+
},
331332
},
332333
},
333334
expectedError: "",
334335
},
335336
{
336-
name: "configure host affinity with invalid affinity",
337+
name: "configure host placement with invalid affinity",
337338
platformType: osconfigv1.AWSPlatformType,
338339
clusterID: "aws-cluster",
339340
providerSpecValue: &kruntime.RawExtension{
@@ -342,13 +343,15 @@ func TestMachineCreation(t *testing.T) {
342343
ID: ptr.To[string]("ami"),
343344
},
344345
InstanceType: "test",
345-
HostAffinity: ptr.To(machinev1beta1.HostAffinity("invalid")),
346+
HostPlacement: &machinev1beta1.HostPlacement{
347+
Affinity: ptr.To(machinev1beta1.HostAffinity("invalid")),
348+
},
346349
},
347350
},
348-
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostID: Required value: hostID must be set when hostAffinity is configured", // true
351+
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostPlacement.affinity: Invalid value: \"invalid\": affinity is required and must be set to an allowed value",
349352
},
350353
{
351-
name: "configure host affinity without Host ID",
354+
name: "configure host placement dedicatedHost without dedicatedHost",
352355
platformType: osconfigv1.AWSPlatformType,
353356
clusterID: "aws-cluster",
354357
providerSpecValue: &kruntime.RawExtension{
@@ -357,13 +360,15 @@ func TestMachineCreation(t *testing.T) {
357360
ID: ptr.To[string]("ami"),
358361
},
359362
InstanceType: "test",
360-
HostAffinity: ptr.To(machinev1beta1.HostAffinityHost),
363+
HostPlacement: &machinev1beta1.HostPlacement{
364+
Affinity: ptr.To(machinev1beta1.HostAffinityDedicatedHost),
365+
},
361366
},
362367
},
363-
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostID: Required value: hostID must be set when hostAffinity is configured", // true
368+
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostPlacement.dedicatedHost: Required value: dedicatedHost is required when affinity is DedicatedHost",
364369
},
365370
{
366-
name: "hostID alone is valid",
371+
name: "configure host placement dedicatedHost with valid ID",
367372
platformType: osconfigv1.AWSPlatformType,
368373
clusterID: "aws-cluster",
369374
providerSpecValue: &kruntime.RawExtension{
@@ -372,11 +377,46 @@ func TestMachineCreation(t *testing.T) {
372377
ID: ptr.To[string]("ami"),
373378
},
374379
InstanceType: "test",
375-
HostID: ptr.To("h-1234567890abcdef0"),
380+
HostPlacement: &machinev1beta1.HostPlacement{
381+
Affinity: ptr.To(machinev1beta1.HostAffinityDedicatedHost),
382+
DedicatedHost: &machinev1beta1.DedicatedHost{ID: "h-1234567890abcdef0"},
383+
},
376384
},
377385
},
378386
expectedError: "",
379387
},
388+
{
389+
name: "configure host placement AnyAvailable forbids dedicatedHost",
390+
platformType: osconfigv1.AWSPlatformType,
391+
clusterID: "aws-cluster",
392+
providerSpecValue: &kruntime.RawExtension{
393+
Object: &machinev1beta1.AWSMachineProviderConfig{
394+
AMI: machinev1beta1.AWSResourceReference{ID: ptr.To[string]("ami")},
395+
InstanceType: "test",
396+
HostPlacement: &machinev1beta1.HostPlacement{
397+
Affinity: ptr.To(machinev1beta1.HostAffinityAnyAvailable),
398+
DedicatedHost: &machinev1beta1.DedicatedHost{ID: "h-09dcf61cb388b0149"},
399+
},
400+
},
401+
},
402+
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostPlacement.dedicatedHost: Forbidden: dedicatedHost is not allowed when affinity is AnyAvailable",
403+
},
404+
{
405+
name: "configure host placement dedicatedHost with empty ID",
406+
platformType: osconfigv1.AWSPlatformType,
407+
clusterID: "aws-cluster",
408+
providerSpecValue: &kruntime.RawExtension{
409+
Object: &machinev1beta1.AWSMachineProviderConfig{
410+
AMI: machinev1beta1.AWSResourceReference{ID: ptr.To[string]("ami")},
411+
InstanceType: "test",
412+
HostPlacement: &machinev1beta1.HostPlacement{
413+
Affinity: ptr.To(machinev1beta1.HostAffinityDedicatedHost),
414+
DedicatedHost: &machinev1beta1.DedicatedHost{ID: ""},
415+
},
416+
},
417+
},
418+
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.hostPlacement.dedicatedHost.id: Invalid value: \"\": id must start with 'h-' followed by 17 lowercase hexadecimal characters (0-9 and a-f)",
419+
},
380420
{
381421
name: "with Azure and a nil provider spec value",
382422
platformType: osconfigv1.AzurePlatformType,
@@ -2019,7 +2059,7 @@ func TestMachineUpdate(t *testing.T) {
20192059
Object: object,
20202060
}
20212061
},
2022-
expectedError: `providerSpec.tagIDs: Invalid value: []string{"urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9500:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9501:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9502:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9503:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9504:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9505:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9506:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9507:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9508:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9509:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9510:GLOBAL", "urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9511:GLOBAL"}: a maximum of 10 tags are allowed`,
2062+
expectedError: `providerSpec.tagIDs: Invalid value: ["urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9500:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9501:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9502:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9503:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9504:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9505:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9506:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9507:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9508:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9509:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9510:GLOBAL","urn:vmomi:InventoryServiceTag:5736bf56-49f5-4667-b38c-b97e09dc9511:GLOBAL"]: a maximum of 10 tags are allowed`,
20232063
},
20242064
{
20252065
name: "with an VSphere ProviderSpec, removing the template",
@@ -3361,7 +3401,7 @@ func TestValidateAzureProviderSpec(t *testing.T) {
33613401
CloudName: osconfigv1.AzurePublicCloud,
33623402
},
33633403
expectedOk: false,
3364-
expectedError: "providerSpec.diagnostics.boot.customerManaged: Invalid value: v1beta1.AzureCustomerManagedBootDiagnostics{StorageAccountURI:\"https://storageaccount.blob.core.windows.net/\"}: customerManaged may not be set when type is AzureManaged",
3404+
expectedError: "providerSpec.diagnostics.boot.customerManaged: Invalid value: {\"storageAccountURI\":\"https://storageaccount.blob.core.windows.net/\"}: customerManaged may not be set when type is AzureManaged",
33653405
},
33663406
{
33673407
testCase: "with Customer Managed boot diagnostics, with a missing storage account URI",
@@ -3944,7 +3984,7 @@ func TestValidateGCPProviderSpec(t *testing.T) {
39443984
}
39453985
},
39463986
expectedOk: false,
3947-
expectedError: "providerSpec.gpus: Too many: 2: must have at most 1 items",
3987+
expectedError: "providerSpec.gpus: Too many: 2: must have at most 1 item",
39483988
},
39493989
{
39503990
testCase: "with no gpus",

‎pkg/webhooks/machineset_webhook_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ func TestMachineSetUpdate(t *testing.T) {
10471047
updateMachineSet: func(ms *machinev1beta1.MachineSet) {
10481048
ms.Spec.Selector.MatchLabels["foo"] = "bar"
10491049
},
1050-
expectedError: "[spec.selector: Forbidden: selector is immutable, spec.template.metadata.labels: Invalid value: map[string]string{\"machineset-name\":\"machineset-update-abcd\"}: `selector` does not match template `labels`]",
1050+
expectedError: "[spec.selector: Forbidden: selector is immutable, spec.template.metadata.labels: Invalid value: {\"machineset-name\":\"machineset-update-abcd\"}: `selector` does not match template `labels`]",
10511051
},
10521052
{
10531053
name: "with an incompatible template labels",
@@ -1061,7 +1061,7 @@ func TestMachineSetUpdate(t *testing.T) {
10611061
"foo": "bar",
10621062
}
10631063
},
1064-
expectedError: "spec.template.metadata.labels: Invalid value: map[string]string{\"foo\":\"bar\"}: `selector` does not match template `labels`",
1064+
expectedError: "spec.template.metadata.labels: Invalid value: {\"foo\":\"bar\"}: `selector` does not match template `labels`",
10651065
},
10661066
{
10671067
name: "with a valid PowerVS ProviderSpec",

0 commit comments

Comments
 (0)