Skip to content

✨ Add all ManagedMachineAMITypes supported by AWS API #5540

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

Jump to bottom
Merged
merged 1 commit into from
Jul 6, 2025
Merged

✨ Add all ManagedMachineAMITypes supported by AWS API #5540

merged 1 commit into from
Jul 6, 2025
+73 −2

Conversation

afarbos
Copy link
Contributor

@afarbos afarbos commented Jun 10, 2025 •
edited by AndiDog
Loading

What type of PR is this?

/kind feature
/kind api-change

What this PR does / why we need it:

Heavily inspired from #5472

Adding support for ALL EKS Managed Node Group AMIs currently supported in order.
List originates from CreateNodeGroup API docs.

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 #2009 by adding support for BottleRocket

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Add support for managed machine AMI types BottleRocket, AL2023 and Windows

@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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 10, 2025
@k8s-ci-robot k8s-ci-robot requested review from luthermonson and nrb June 10, 2025 20:26
@k8s-ci-robot
Copy link
Contributor

Welcome @afarbos!

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

Hi @afarbos. 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.

@k8s-ci-robot k8s-ci-robot added 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 Jun 10, 2025
@afarbos afarbos changed the title feat: Add all ManagedMachineAMITypes supported by AWS API ✨ Add all ManagedMachineAMITypes supported by AWS API Jun 10, 2025
@afarbos afarbos force-pushed the af/AddAllManagedMachineAMIType branch 3 times, most recently from 63aae2e to 054ff36 Compare June 10, 2025 20:32
@AndiDog
Copy link
Contributor

AndiDog commented Jun 24, 2025

/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 Jun 24, 2025
@afarbos afarbos force-pushed the af/AddAllManagedMachineAMIType branch from 054ff36 to b3b83d9 Compare June 25, 2025 17:22
@AndiDog
Copy link
Contributor

AndiDog commented Jun 25, 2025

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

AmitSahastra
AmitSahastra reviewed Jul 3, 2025
View reviewed changes
exp/api/v1beta2/awsmanagedmachinepool_types.go
@@ -129,7 +159,7 @@ type AWSManagedMachinePoolSpec struct {
AMIVersion *string `json:"amiVersion,omitempty"`

// AMIType defines the AMI type
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;CUSTOM
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;CUSTOM;BOTTLEROCKET_ARM_64;BOTTLEROCKET_x86_64;BOTTLEROCKET_ARM_64_FIPS;BOTTLEROCKET_x86_64_FIPS;BOTTLEROCKET_ARM_64_NVIDIA;BOTTLEROCKET_x86_64_NVIDIA;WINDOWS_CORE_2019_x86_64;WINDOWS_FULL_2019_x86_64;WINDOWS_CORE_2022_x86_64;WINDOWS_FULL_2022_x86_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;AL2023_x86_64_NEURON;AL2023_x86_64_NVIDIA;AL2023_ARM_64_NVIDIA
Copy link
Contributor

@AmitSahastra AmitSahastra Jul 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Are we planning to drop support for "CUSTOM"? Currently its mandatory while using LaunchTemplate with ami-id.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't understand this question. The line you are commenting on include CUSTOM so the answer is no. Can you explain more in details what you are referring to?

Copy link
Contributor

Choose a reason for hiding this comment

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

Oops, I overlooked that part. Please ignore

@AndiDog
Copy link
Contributor

AndiDog commented Jul 4, 2025

/lgtm

Mergin soon unless there are more concerns (@AmitSahastra in case you want to clarify the comment thread).

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 4, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 5d2da98c79c4165365248393cdafb17ec599bc6b

@AndiDog
Copy link
Contributor

AndiDog commented Jul 6, 2025

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AndiDog

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:

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 6, 2025
@k8s-ci-robot k8s-ci-robot merged commit 56e7036 into kubernetes-sigs:main Jul 6, 2025
25 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v2.8 milestone Jul 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AmitSahastra AmitSahastra

@luthermonson luthermonson

@nrb nrb

Assignees

@AndiDog AndiDog

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v2.8
Development

Successfully merging this pull request may close these issues.

Option to use bottlerocket AMI's for EKS nodes
4 participants
@afarbos @k8s-ci-robot @AndiDog @AmitSahastra