✨ ROSAMachinePool: support for capacity reservations #5649

mzazrivec · 2025-09-04T16:43:49Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This pull request adds support for AWS Capacity Reservations to the ROSAMachinePool custom resource.

The capacityReservationId is the string id of the AWS on-demand capacity reservation and it must be created in advance, before creating the node pool.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Checklist:

Release note:

New ROSAMachinePool parameter for specifying AWS capacity reservation.

k8s-ci-robot · 2025-09-04T16:44:00Z

Hi @mzazrivec. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

richardcase · 2025-09-06T10:25:14Z

/ok-to-test

serngawy · 2025-09-16T13:41:30Z

test/mocks/ocm_client_mock.go


 	gomock "github.com/golang/mock/gomock"
-	v1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"
+	v1 "github.com/openshift-online/ocm-api-model/clientapi/clustersmgmt/v1"


No need to change this

Suggested change

v1 "github.com/openshift-online/ocm-api-model/clientapi/clustersmgmt/v1"

v1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"

Actually, I put the change back. I remembered that this one change is generated by go generate and without it make verify-gen (part of CI) would be failing.

mzazrivec · 2025-09-19T12:48:33Z

/retest

serngawy · 2025-09-19T14:36:55Z

/lgtm

k8s-ci-robot · 2025-09-19T14:37:03Z

LGTM label has been added.

Git tree hash: f144ef64bc5215666857d3df0651429ad543b415

serngawy · 2025-09-19T14:54:59Z

/approved

damdo

Looks reasonable, just one nit

exp/api/v1beta2/rosamachinepool_types.go

damdo

Thanks

/lgtm

k8s-ci-robot · 2025-09-24T09:57:28Z

LGTM label has been added.

Git tree hash: 6a943899e6d7a84517eb734581cb6eeb60b14a91

damdo · 2025-09-24T10:31:26Z

This one should be ready now @nrb @richardcase

bchandra-ocp

I had an inquiry/feedback left in the comment.

bchandra-ocp · 2025-09-25T23:30:49Z

config/crd/bases/infrastructure.cluster.x-k8s.io_rosamachinepools.yaml

                type: string
+              capacityReservationID:
+                description: |-
+                  CapacityReservationID specifies the ID of an AWS On-Demand Capacity Reservation.


My understanding is that CapacityReservationID can specify the ID of both AWS ODCR and CapacityBlocks for ML. ROSA will inquire the type of capacity reservation from AWS and populate the market type accordingly. If so, should we clarify that here in the description?

@bchandra-ocp What description string are you proposing?

How about

CapacityReservationID specifies the ID of an AWS On-Demand Capacity Reservation and Capacity Blocks for ML

@bchandra-ocp Added.

damdo

/lgtm

k8s-ci-robot · 2025-09-30T08:15:33Z

LGTM label has been added.

Git tree hash: c3aa1db4d156871076d3feb4cf916163cbe5d60c

damdo · 2025-09-30T09:41:51Z

/assign @nrb @richardcase

Would you be able to add your review/labels here thanks!

damdo · 2025-09-30T09:44:41Z

/label tide/merge-method-squash

richardcase · 2025-09-30T10:54:16Z

/approve

k8s-ci-robot · 2025-09-30T10:54:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [richardcase]

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

mzazrivec · 2025-09-30T11:17:53Z

/retest

damdo · 2025-09-30T11:31:55Z

/test pull-cluster-api-provider-aws-e2e-blocking

)

serngawy · 2025-10-06T11:36:07Z

/cherry-pick release-2.9

k8s-infra-cherrypick-robot · 2025-10-06T11:36:41Z

@serngawy: #5649 failed to apply on top of branch "release-2.9":

Applying: ROSAMachinePool: support for capacity reservations
Using index info to reconstruct a base tree...
M	config/crd/bases/infrastructure.cluster.x-k8s.io_rosamachinepools.yaml
M	exp/controllers/rosamachinepool_controller.go
A	exp/utils/rosa_helper.go
M	go.mod
M	go.sum
M	test/mocks/ocm_client_mock.go
Falling back to patching base and 3-way merge...
Auto-merging test/mocks/ocm_client_mock.go
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (modify/delete): exp/utils/rosa_helper.go deleted in HEAD and modified in ROSAMachinePool: support for capacity reservations. Version ROSAMachinePool: support for capacity reservations of exp/utils/rosa_helper.go left in tree.
Auto-merging exp/controllers/rosamachinepool_controller.go
Auto-merging config/crd/bases/infrastructure.cluster.x-k8s.io_rosamachinepools.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 ROSAMachinePool: support for capacity reservations

In response to this:

/cherry-pick release-2.9

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.

serngawy · 2025-10-07T17:01:45Z

/cherry-pick release-2.9

k8s-infra-cherrypick-robot · 2025-10-07T17:02:21Z

@serngawy: new pull request created: #5698

In response to this:

/cherry-pick release-2.9

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.

k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 4, 2025

k8s-ci-robot requested review from cnmcavoy and serngawy September 4, 2025 16:43

k8s-ci-robot added needs-priority needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 4, 2025

mzazrivec changed the title ~~ROSAMachinePool: support for capacity reservations~~ ✨ ROSAMachinePool: support for capacity reservations Sep 4, 2025

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 6, 2025

mzazrivec force-pushed the capacity_reservations_in_rosa_machinepool branch 4 times, most recently from 71a4d19 to b932828 Compare September 8, 2025 14:21

serngawy suggested changes Sep 16, 2025

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 18, 2025

mzazrivec force-pushed the capacity_reservations_in_rosa_machinepool branch from b932828 to 0db2942 Compare September 19, 2025 10:20

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 19, 2025

mzazrivec force-pushed the capacity_reservations_in_rosa_machinepool branch from 0db2942 to e08500c Compare September 19, 2025 12:16

serngawy approved these changes Sep 19, 2025

View reviewed changes

k8s-ci-robot assigned serngawy Sep 19, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 19, 2025

damdo reviewed Sep 23, 2025

View reviewed changes

exp/api/v1beta2/rosamachinepool_types.go Outdated Show resolved Hide resolved

k8s-ci-robot requested a review from serngawy September 23, 2025 19:28

damdo reviewed Sep 24, 2025

View reviewed changes

k8s-ci-robot assigned damdo Sep 24, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 24, 2025

bchandra-ocp reviewed Sep 25, 2025

View reviewed changes

ROSAMachinePool: support for capacity reservations

8853c4b

mzazrivec force-pushed the capacity_reservations_in_rosa_machinepool branch from e82eb26 to 8853c4b Compare September 29, 2025 18:25

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 29, 2025

k8s-ci-robot requested a review from damdo September 29, 2025 18:26

damdo reviewed Sep 30, 2025

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 30, 2025

k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 30, 2025

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 30, 2025

k8s-ci-robot merged commit c278953 into kubernetes-sigs:main Sep 30, 2025
19 checks passed

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/cluster-api-provider-aws that referenced this pull request Oct 2, 2025

ROSAMachinePool: support for capacity reservations (kubernetes-sigs#5649

08a99ce

)

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/cluster-api-provider-aws that referenced this pull request Oct 2, 2025

ROSAMachinePool: support for capacity reservations (kubernetes-sigs#5649

877628a

)

k8s-infra-cherrypick-robot mentioned this pull request Oct 7, 2025

[release-2.9] ✨ ROSAMachinePool: support for capacity reservations #5698

Merged

	v1 "github.com/openshift-online/ocm-api-model/clientapi/clustersmgmt/v1"
	v1 "github.com/openshift-online/ocm-sdk-go/clustersmgmt/v1"

✨ ROSAMachinePool: support for capacity reservations #5649

✨ ROSAMachinePool: support for capacity reservations #5649

Conversation

mzazrivec commented Sep 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Sep 4, 2025

Uh oh!

richardcase commented Sep 6, 2025

Uh oh!

serngawy Sep 16, 2025

Choose a reason for hiding this comment

Uh oh!

mzazrivec Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

mzazrivec Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

mzazrivec commented Sep 19, 2025

Uh oh!

serngawy commented Sep 19, 2025

Uh oh!

k8s-ci-robot commented Sep 19, 2025

Uh oh!

serngawy commented Sep 19, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Sep 24, 2025

Uh oh!

damdo commented Sep 24, 2025

Uh oh!

bchandra-ocp left a comment

Choose a reason for hiding this comment

Uh oh!

bchandra-ocp Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

mzazrivec Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

bchandra-ocp Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

mzazrivec Sep 29, 2025

Choose a reason for hiding this comment

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Sep 30, 2025

Uh oh!

damdo commented Sep 30, 2025

Uh oh!

damdo commented Sep 30, 2025

Uh oh!

richardcase commented Sep 30, 2025

Uh oh!

k8s-ci-robot commented Sep 30, 2025

Uh oh!

mzazrivec commented Sep 30, 2025

Uh oh!

damdo commented Sep 30, 2025

Uh oh!

Uh oh!

serngawy commented Oct 6, 2025

Uh oh!

k8s-infra-cherrypick-robot commented Oct 6, 2025

Uh oh!

serngawy commented Oct 7, 2025

Uh oh!

k8s-infra-cherrypick-robot commented Oct 7, 2025

Uh oh!

Reviewers

mzazrivec commented Sep 4, 2025 •

edited

Loading