Skip to content

SPLAT-2680: Changed DHA to require hostAffinity=host #1484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 23, 2026
+10 −2
Merged

SPLAT-2680: Changed DHA to require hostAffinity=host #1484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/webhooks/machine_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,14 @@ func processAWSPlacementTenancy(m *machinev1beta1.Machine, placement machinev1be
case machinev1beta1.HostAffinityAnyAvailable:
// DedicatedHost is optional. If it is set, make sure it follows conventions
if placement.Host.DedicatedHost != nil {
// Dynamic Host Allocation (DHA) requires DedicatedHost affinity
strategy := machinev1beta1.AllocationStrategyUserProvided
if placement.Host.DedicatedHost.AllocationStrategy != nil {
strategy = *placement.Host.DedicatedHost.AllocationStrategy
}
if strategy == machinev1beta1.AllocationStrategyDynamic {
errs = append(errs, field.Forbidden(field.NewPath("spec.placement.host.affinity"), "hostAffinity must be DedicatedHost when using dynamic host allocation"))
}
errs = append(errs, validateDedicatedHost(placement.Host.DedicatedHost)...)
}
case machinev1beta1.HostAffinityDedicatedHost:
Expand Down
4 changes: 2 additions & 2 deletions pkg/webhooks/machine_webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ func TestMachineCreation(t *testing.T) {
},
},
},
expectedError: "",
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.placement.host.affinity: Forbidden: hostAffinity must be DedicatedHost when using dynamic host allocation",
},
{
name: "configure Affinity AnyAvailable with AllocationStrategy Dynamic and DynamicHostAllocation",
Expand All @@ -1032,7 +1032,7 @@ func TestMachineCreation(t *testing.T) {
},
},
},
expectedError: "",
expectedError: "admission webhook \"validation.machine.machine.openshift.io\" denied the request: spec.placement.host.affinity: Forbidden: hostAffinity must be DedicatedHost when using dynamic host allocation",
},
{
name: "control plane machine with dedicated host should fail",
Expand Down