Skip to content

Conversation

@moko-poi
Copy link

@moko-poi moko-poi commented Nov 6, 2025

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 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
Copy link
Contributor

[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:

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 k8s-ci-robot requested a review from serngawy November 6, 2025 15:40
@k8s-ci-robot 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
Copy link
Contributor

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 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
@k8s-ci-robot
Copy link
Contributor

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 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
Copy link
Author

moko-poi commented Nov 7, 2025

71efb58
The fix was incorporated based on #4358

@richardcase
Copy link
Member

/ok-to-test

@k8s-ci-robot 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
Copy link
Member

@richardcase richardcase left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good, thanks @moko-poi .

Just the one comment.

DiskSize *int32 `json:"diskSize,omitempty"`

// InstanceType specifies the AWS instance type
// InstanceType specifies the AWS instance type.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets mark InstanceType as deprecated as well. Long term, we can remove the field and just rely on the InstanceTypes field.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. needs-priority ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support a list of instance types in AWSManagedMachinePool

3 participants