Skip to content

✨Added new ManagedMachineAMIType supported by EKS Managed Node Groups #5472

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

✨Added new ManagedMachineAMIType supported by EKS Managed Node Groups #5472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db913af
Added support for additional AL2023 GPU types and bottlerocket
edmondceausu Apr 18, 2025
3c89665
removed type custom because it is not a valid ManagedMachineAMIType
edmondceausu Apr 19, 2025
d03208b
updated comments to pass linter
edmondceausu Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,16 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- BOTTLEROCKET_ARM_64
- BOTTLEROCKET_x86_64
- BOTTLEROCKET_ARM_64_FIPS
- BOTTLEROCKET_x86_64_FIPS
- BOTTLEROCKET_ARM_64_NVIDIA
- BOTTLEROCKET_x86_64_NVIDIA
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- CUSTOM
- AL2023_x86_64_NEURON
- AL2023_x86_64_NVIDIA
type: string
amiVersion:
description: |-
Expand Down
18 changes: 17 additions & 1 deletion exp/api/v1beta2/awsmanagedmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,22 @@ const (
Al2023x86_64 ManagedMachineAMIType = "AL2023_x86_64_STANDARD"
// Al2023Arm64 is the AL2023 Arm AMI type.
Al2023Arm64 ManagedMachineAMIType = "AL2023_ARM_64_STANDARD"
// Al2023x86_64Neuron is the Neuron GPU type
Al2023x86_64Neuron ManagedMachineAMIType = "AL2023_x86_64_NEURON"
// Al2023x86_64Nvidia is the Nvidia GPU type
Al2023x86_64Nvidia ManagedMachineAMIType = "AL2023_x86_64_NVIDIA"
// BottleRocketArm64 is the ARM64 AMI type
BottleRocketArm64 ManagedMachineAMIType = "BOTTLEROCKET_ARM_64"
// BottleRocketx86_64 is the BottleRocket x86 AMI type
BottleRocketx86_64 ManagedMachineAMIType = "BOTTLEROCKET_x86_64"
// BottleRocketArm64Fips is the BottleRocket Arm64 Fips AMI type
BottleRocketArm64Fips ManagedMachineAMIType = "BOTTLEROCKET_ARM_64_FIPS"
// BottleRocketx86_64Fips is the BottleRocket x86 Fips AMI type
BottleRocketx86_64Fips ManagedMachineAMIType = "BOTTLEROCKET_x86_64_FIPS"
// BottleRocketArm64Nvidia is the BottleRocket Arm Nvidia AMI type
BottleRocketArm64Nvidia ManagedMachineAMIType = "BOTTLEROCKET_ARM_64_NVIDIA"
// BottleRocketx86_64Nvidia is the BottleRocket x86 Nvidia AMI type
BottleRocketx86_64Nvidia ManagedMachineAMIType = "BOTTLEROCKET_x86_64_NVIDIA"
)

// ManagedMachinePoolCapacityType specifies the capacity type to be used for the managed MachinePool.
Expand Down Expand Up @@ -129,7 +145,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
Copy link
Contributor

Choose a reason for hiding this comment

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

Are we going to break users who already have a CUSTOM value here?

// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;BOTTLEROCKET_ARM_64;BOTTLEROCKET_x86_64;BOTTLEROCKET_ARM_64_FIPS;BOTTLEROCKET_x86_64_FIPS;BOTTLEROCKET_ARM_64_NVIDIA;BOTTLEROCKET_x86_64_NVIDIA;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;AL2023_x86_64_NEURON;AL2023_x86_64_NVIDIA
// +kubebuilder:default:=AL2_x86_64
// +optional
AMIType *ManagedMachineAMIType `json:"amiType,omitempty"`
Expand Down
Loading