SPLAT-2172: AWS dedicate host support #10079

vr4manta · 2025-11-13T18:42:28Z

Changes

Bumped openshift/api
Added logic to allow HostPlacement of dedicated hosts

Dependencies

Notes

MAO and CAO changes are needed for it to fully work. For now, this PR is adding the ability to generate the needed outputs for bootstrapping.

openshift-ci-robot · 2025-11-13T18:42:32Z

@vr4manta: This pull request references SPLAT-2172 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

SPLAT-2172

Changes

Bumped openshift/api

Added logic to allow HostPlacement of dedicated hosts

Dependencies

SPLAT-2206: Added AWS dedicated host support api#2484

SPLAT-2167: Added dedicated hosts support for AWS machine-api-operator#1419

SPLAT-2167: Added dedicated host support for AWS cluster-capi-operator#374

SPLAT-2540: Added test support for AWS dedicated hosts cluster-api-actuator-pkg#446

Notes

MAO and CAO changes are needed for it to fully work. For now, this PR is adding the ability to generate the needed outputs for bootstrapping.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

tthvo · 2025-11-14T00:35:26Z

/cc

tthvo · 2025-11-18T02:10:05Z

/retest-required

tthvo

Cool feature 👍 🚀

I have quite some comments 😅 Sorry if I review a little too soon...

pkg/types/aws/validation/machinepool.go

tthvo · 2025-11-18T05:56:02Z

pkg/types/aws/validation/machinepool.go

+		switch *p.HostPlacement.Affinity {
+		case aws.HostAffinityAnyAvailable:
+			if p.HostPlacement.DedicatedHost != nil {
+				allErrs = append(allErrs, field.Required(fldPath.Child("dedicatedHost"), "dedicatedHost is required when 'affinity' is set to DedicatedHost, and forbidden otherwise"))


Did you mean hostPlacement.dedicatedHost is forbidden if affinity is AnyAvailable?

allErrs = append(allErrs, field.Forbidden(fldPath.Child("dedicatedHost"), "dedicatedHost must not be set when affinity is AnyAvailable"))

@tthvo So this was an interesting one. In openshift/api and openshift/machine-api-operator, it was suggested to error this way for this scenario. I was doing this to keep it consistent.

https://github.com/openshift/api/blob/0598ae66682433c49adc29b1ff14a201487f3afe/machine/v1beta1/types_awsprovider.go#L406

openshift/machine-api-operator@f669914#diff-30c686f7a9dbd2aa917e5e410401d720a2a4bf4a11163495f5610c8f4b98edaeR917

Now that said, I am happy to make your suggestion if you prefer installer say it this way. Just let me know.

pkg/types/aws/validation/machinepool.go

pkg/types/aws/validation/machinepool_test.go

pkg/asset/installconfig/aws/validation.go

tthvo · 2025-11-18T10:21:46Z

pkg/asset/installconfig/aws/validation.go

+			if err != nil {
+				allErrs = append(allErrs, field.InternalError(placementPath.Child("dedicatedHost"), err))
+			} else {
+				// Check the returned configured hosts to see if the dedicated hosts defined in install-config exists.


💡 ❓ I got 2 questions here:

Do the zones of dedicated hosts need to match machinepool zone field if defined?

installer/pkg/types/aws/machinepool.go

Lines 5 to 9 in 7c9b71a

type MachinePool struct {

// Zones is list of availability zones that can be used.

//

// +optional

Zones []string `json:"zones,omitempty"`

Do the user-input zones for dedicated hosts need to match with the actual zones returned from AWS?

// If user specified a zone, validate it matches AWS if host.Zone != "" && host.Zone != hostDetails.Zone { allErrs = append(allErrs, field.Invalid( fldPath.Child("hostPlacement", "dedicatedHost").Index(i).Child("zone"), host.Zone, fmt.Sprintf("specified zone %s does not match actual host zone %s", host.Zone, hostDetails.Zone))) }

pkg/asset/machines/worker.go

pkg/asset/machines/aws/awsmachines.go

pkg/asset/machines/aws/machinesets.go

vr4manta · 2025-11-18T18:45:04Z

/hold
Need to rebase and add validation logic to make sure defined dedicated hosts are in zones based on the machinepool config.

vr4manta · 2025-11-21T20:17:31Z

/payload-job periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-dedicated

openshift-ci · 2025-11-21T20:17:46Z

@vr4manta: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-master-nightly-4.21-e2e-aws-ovn-dedicated

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1c5c6d80-c717-11f0-93e9-d918c346504c-0

vr4manta · 2025-11-24T13:30:33Z

/unhold
/retest

vr4manta · 2025-11-26T12:45:36Z

/retest

vr4manta · 2025-12-02T18:51:18Z

/hold
based on discussions with @patrickdillon and @JoelSpeed , I am adding MAPA support and then will enhance this PR to leverage that code path without being dependent on CAPI.

openshift-ci-robot · 2025-12-02T18:51:53Z

@vr4manta: This pull request references SPLAT-2172 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

SPLAT-2172

Changes

Bumped openshift/api

Added logic to allow HostPlacement of dedicated hosts

Dependencies

SPLAT-2206: Added AWS dedicated host support api#2484

SPLAT-2167: Added dedicated hosts support for AWS machine-api-operator#1419

SPLAT-2167: Added dedicated host support for AWS cluster-capi-operator#374

SPLAT-2540: Added test support for AWS dedicated hosts cluster-api-actuator-pkg#446

SPLAT-2558: Add AWS Dedicated Host support machine-api-provider-aws#160

Notes

MAO and CAO changes are needed for it to fully work. For now, this PR is adding the ability to generate the needed outputs for bootstrapping.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

vr4manta · 2026-01-07T18:18:57Z

I'm leaving the hold on until the MAO (MAPA) changes are merged.

vr4manta · 2026-01-13T14:35:04Z

/unhold
MAPA is now merged. There is an outstanding bug in CAPI, but installer leverages MAPA (not CAPA) so we should be good for now. MAPI2CAPI and CAPI2MAPI will be addressed in other PRs.

vr4manta · 2026-01-13T14:35:36Z

/assign @patrickdillon

vr4manta · 2026-01-13T14:59:55Z

/retest

vr4manta · 2026-01-28T15:51:43Z

/hold
Due to not getting reviewed in time, i'll put this on hold and add the dynamic dedicated host support.

openshift-ci · 2026-01-28T17:31:12Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from patrickdillon. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2026-01-29T03:58:24Z

@vr4manta: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-aws-ovn-heterogeneous	`9364945`	link	false	`/test e2e-aws-ovn-heterogeneous`
ci/prow/e2e-gcp-ovn-xpn	`9364945`	link	false	`/test e2e-gcp-ovn-xpn`
ci/prow/e2e-metal-ovn-two-node-fencing	`9364945`	link	false	`/test e2e-metal-ovn-two-node-fencing`
ci/prow/gcp-private	`9364945`	link	false	`/test gcp-private`
ci/prow/e2e-gcp-secureboot	`9364945`	link	false	`/test e2e-gcp-secureboot`
ci/prow/gcp-custom-endpoints-proxy-wif	`9364945`	link	false	`/test gcp-custom-endpoints-proxy-wif`
ci/prow/e2e-metal-assisted	`9364945`	link	false	`/test e2e-metal-assisted`
ci/prow/e2e-metal-ipi-ovn-virtualmedia	`9364945`	link	false	`/test e2e-metal-ipi-ovn-virtualmedia`
ci/prow/e2e-metal-ipi-ovn	`9364945`	link	false	`/test e2e-metal-ipi-ovn`
ci/prow/e2e-gcp-ovn	`9364945`	link	true	`/test e2e-gcp-ovn`
ci/prow/e2e-metal-single-node-live-iso	`9364945`	link	false	`/test e2e-metal-single-node-live-iso`
ci/prow/e2e-gcp-custom-dns	`9364945`	link	false	`/test e2e-gcp-custom-dns`
ci/prow/e2e-azurestack	`9364945`	link	false	`/test e2e-azurestack`
ci/prow/e2e-gcp-default-config	`9364945`	link	false	`/test e2e-gcp-default-config`
ci/prow/e2e-gcp-xpn-dedicated-dns-project	`9364945`	link	false	`/test e2e-gcp-xpn-dedicated-dns-project`
ci/prow/e2e-openstack-ovn	`9364945`	link	true	`/test e2e-openstack-ovn`
ci/prow/e2e-gcp-custom-endpoints	`9364945`	link	false	`/test e2e-gcp-custom-endpoints`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 13, 2025

openshift-ci bot requested review from mtulio and patrickdillon November 13, 2025 18:43

openshift-ci bot requested a review from tthvo November 14, 2025 00:35

vr4manta force-pushed the SPLAT-2172 branch 3 times, most recently from 24500b6 to 342ab2d Compare November 17, 2025 17:44

tthvo reviewed Nov 18, 2025

View reviewed changes

vr4manta force-pushed the SPLAT-2172 branch from 342ab2d to f624e2f Compare November 18, 2025 18:51

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 18, 2025

vr4manta force-pushed the SPLAT-2172 branch 5 times, most recently from 82915c2 to 8ef8679 Compare November 21, 2025 13:54

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2025

vr4manta force-pushed the SPLAT-2172 branch from 8ef8679 to b21797f Compare November 21, 2025 19:37

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 21, 2025

vr4manta force-pushed the SPLAT-2172 branch from b21797f to eae7731 Compare November 21, 2025 19:40

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 24, 2025

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2025

vr4manta force-pushed the SPLAT-2172 branch from eae7731 to e874fe7 Compare January 7, 2026 18:16

vr4manta force-pushed the SPLAT-2172 branch from e874fe7 to be82814 Compare January 8, 2026 12:53

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 13, 2026

openshift-ci bot assigned patrickdillon Jan 13, 2026

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 28, 2026

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2026

vr4manta added 4 commits January 28, 2026 12:27

vendor updates

8236184

Add IPI installation on AWS dedicated hosts

fb259c9

Enhanced AWS dedicated host id validation to allow older 8 char hosts

4787848

Added logic to handle cleaning up dynamic dedicated hosts

94445bc

vr4manta force-pushed the SPLAT-2172 branch from 3ecc039 to 94445bc Compare January 28, 2026 17:29

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 28, 2026

Fix lint issues w/ legacy tests

9364945

	type MachinePool struct {
	// Zones is list of availability zones that can be used.
	//
	// +optional
	Zones []string `json:"zones,omitempty"`

SPLAT-2172: AWS dedicate host support #10079

Are you sure you want to change the base?

SPLAT-2172: AWS dedicate host support #10079

Uh oh!

Conversation

vr4manta commented Nov 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Dependencies

Notes

Uh oh!

openshift-ci-robot commented Nov 13, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Dependencies

Notes

Uh oh!

tthvo commented Nov 14, 2025

Uh oh!

tthvo commented Nov 18, 2025

Uh oh!

tthvo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tthvo Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

vr4manta Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tthvo Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vr4manta commented Nov 18, 2025

Uh oh!

vr4manta commented Nov 21, 2025

Uh oh!

openshift-ci bot commented Nov 21, 2025

Uh oh!

vr4manta commented Nov 24, 2025

Uh oh!

vr4manta commented Nov 26, 2025

Uh oh!

vr4manta commented Dec 2, 2025

Uh oh!

openshift-ci-robot commented Dec 2, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Dependencies

Notes

Uh oh!

vr4manta commented Jan 7, 2026

Uh oh!

vr4manta commented Jan 13, 2026

Uh oh!

vr4manta commented Jan 13, 2026

Uh oh!

vr4manta commented Jan 13, 2026

Uh oh!

vr4manta commented Jan 28, 2026

Uh oh!

openshift-ci bot commented Jan 28, 2026

Uh oh!

openshift-ci bot commented Jan 29, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

vr4manta commented Nov 13, 2025 •

edited

Loading

openshift-ci-robot commented Nov 13, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Dec 2, 2025 •

edited by openshift-ci bot

Loading