✨ Add support for multiple instance types in AWSManagedMachinePool #5732

moko-poi · 2025-11-06T15:40:21Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

This PR adds support for specifying multiple instance types in AWSManagedMachinePool by introducing a new instanceTypes field. This enhancement improves availability, especially when using Spot instances with EKS Managed Node Groups.

Key changes:

Added new instanceTypes (plural) field to specify a list of instance types
Retained existing instanceType (singular) field for backward compatibility
Implemented webhook validation to ensure mutual exclusivity between the two fields
Added conversion logic between v1beta1 and v1beta2 API versions
Enhanced launch template validation to reject both fields when launch template is specified

Which issue(s) this PR fixes:
Fixes #3585

Special notes for your reviewer:

instanceType and instanceTypes are mutually exclusive, enforced by webhook validation
When converting v1beta2 instanceTypes to v1beta1, the first element is used as instanceType
Annotation-based conversion data is utilized to preserve state during version conversions
When launch template is specified, both instanceType and instanceTypes are rejected, consistent with existing validation

Release note:

✨ AWSManagedMachinePool now supports specifying multiple instance types via the new `instanceTypes` field, enhancing Spot instance availability. The existing `instanceType` field remains supported for backward compatibility.

k8s-ci-robot · 2025-11-06T15:40:28Z

[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 assign vincepri for approval. For more information see the Code Review Process.

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

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

k8s-ci-robot · 2025-11-06T15:40:30Z

Welcome @moko-poi!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-aws 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-aws has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-11-06T15:40:31Z

Hi @moko-poi. Thanks for your PR.

I'm waiting for a github.com 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.

moko-poi · 2025-11-07T00:35:25Z

71efb58
The fix was incorporated based on #4358

richardcase · 2025-11-07T15:19:07Z

/ok-to-test

richardcase

This looks good, thanks @moko-poi .

Just the one comment.

exp/api/v1beta2/awsmanagedmachinepool_types.go

moko-poi · 2025-11-24T13:26:08Z

Hi @serngawy @richardcase,

I've addressed the review comments and the PR is ready for another look. Could you please review when you get a chance?

Thank you!

richardcase · 2025-11-25T15:01:57Z

exp/api/v1beta2/awsmanagedmachinepool_types.go

+	// uses the order of instance types to determine which instance type to use first when fulfilling capacity.
+	// See AWS documentation https://docs.aws.amazon.com/eks/latest/userguide/managed-node-groups.html#managed-node-group-capacity-types
+	// for more information.
+	// At most one of InstanceType or InstanceTypes may be specified.


I'd maybe remove this comment as the deprecation notice could suffice. wdyt?

@richardcase
Good point! Removed the redundant comment. The deprecation notice on InstanceType makes it clear enough that users should migrate to InstanceTypes. Thanks for the feedback!
3ac7f79

richardcase · 2025-11-25T15:03:51Z

this looks good to me @moko-poi . Just one comment, let me know what you think.

richardcase · 2025-11-25T15:04:01Z

/test ?

k8s-ci-robot · 2025-11-25T15:04:04Z

@richardcase: The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-aws-build

/test pull-cluster-api-provider-aws-build-docker

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

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

/test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-aws-apidiff-main

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

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

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

/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

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

/test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-aws-apidiff-main

pull-cluster-api-provider-aws-build

pull-cluster-api-provider-aws-build-docker

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

pull-cluster-api-provider-aws-test

pull-cluster-api-provider-aws-verify

In response to this:

/test ?

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-11-25T15:04:21Z

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

serngawy

looks good to me in general, one comment as better field desc.

serngawy · 2025-11-25T15:37:57Z

exp/api/v1beta2/awsmanagedmachinepool_types.go

+	// InstanceTypes specifies a list of AWS instance types for the node group.
+	// The order of instance types specified determines priority of picking that instance type.
+	// This is also influenced by the CapacityType. For On-Demand capacity, the allocation strategy
+	// uses the order of instance types to determine which instance type to use first when fulfilling capacity.


Suggested change

// uses the order of instance types to determine which instance type to use first when fulfilling capacity.

// uses the order of instance types to determine which instance type to use first when fulfilling capacity for ex; c5.large, c4.large, and c3.large .

@serngawy
Thanks for the suggestion! I've added concrete examples (c5.large, c4.large, and c3.large) to illustrate how the instance type ordering works. This should make it clearer for users how to specify and prioritize their instance types.

f6e9be3

…usivity

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. labels Nov 6, 2025

k8s-ci-robot requested a review from richardcase November 6, 2025 15:40

k8s-ci-robot requested a review from serngawy November 6, 2025 15:40

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority labels Nov 6, 2025

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 6, 2025

moko-poi changed the title ~~Add support for multiple instance types in AWSManagedMachinePool~~ ✨ Add support for multiple instance types in AWSManagedMachinePool Nov 6, 2025

moko-poi mentioned this pull request Nov 6, 2025

Support a list of instance types in AWSManagedMachinePool #3585

Open

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 Nov 7, 2025

richardcase reviewed Nov 7, 2025

View reviewed changes

exp/api/v1beta2/awsmanagedmachinepool_types.go Show resolved Hide resolved

moko-poi requested a review from richardcase November 15, 2025 08:07

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

moko-poi added 3 commits November 21, 2025 00:00

Add support for multiple instance types in AWSManagedMachinePool

40a8f41

Add deprecation notice and improve documentation for InstanceType field

2336b84

Mark InstanceType field as deprecated with kubebuilder annotation

ecb9ac3

moko-poi force-pushed the feature/add-instance-types-to-managed-machine-pool branch from afa49b9 to ecb9ac3 Compare November 20, 2025 15:01

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

richardcase reviewed Nov 25, 2025

View reviewed changes

serngawy reviewed Nov 25, 2025

View reviewed changes

moko-poi added 2 commits November 26, 2025 21:35

Remove redundant comment about InstanceType/InstanceTypes mutual excl…

3ac7f79

…usivity

docs: add instance type examples to InstanceTypes field comment

f6e9be3

moko-poi requested review from richardcase and serngawy November 26, 2025 12:39

make generate

b712b6c

	// uses the order of instance types to determine which instance type to use first when fulfilling capacity.
	// uses the order of instance types to determine which instance type to use first when fulfilling capacity for ex; c5.large, c4.large, and c3.large .

✨ Add support for multiple instance types in AWSManagedMachinePool #5732

Are you sure you want to change the base?

✨ Add support for multiple instance types in AWSManagedMachinePool #5732

Conversation

moko-poi commented Nov 6, 2025

Uh oh!

k8s-ci-robot commented Nov 6, 2025

Uh oh!

k8s-ci-robot commented Nov 6, 2025

Uh oh!

k8s-ci-robot commented Nov 6, 2025

Uh oh!

moko-poi commented Nov 7, 2025

Uh oh!

richardcase commented Nov 7, 2025

Uh oh!

richardcase left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

moko-poi commented Nov 24, 2025

Uh oh!

richardcase Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

moko-poi Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

richardcase commented Nov 25, 2025

Uh oh!

richardcase commented Nov 25, 2025

Uh oh!

k8s-ci-robot commented Nov 25, 2025

Uh oh!

richardcase commented Nov 25, 2025

Uh oh!

serngawy left a comment

Choose a reason for hiding this comment

Uh oh!

serngawy Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

moko-poi Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

moko-poi Nov 26, 2025 •

edited

Loading

moko-poi Nov 26, 2025 •

edited

Loading