diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml index 83d114ce07..e8359099cc 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml @@ -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: |- diff --git a/exp/api/v1beta2/awsmanagedmachinepool_types.go b/exp/api/v1beta2/awsmanagedmachinepool_types.go index d7dc3f40ab..b8181da574 100644 --- a/exp/api/v1beta2/awsmanagedmachinepool_types.go +++ b/exp/api/v1beta2/awsmanagedmachinepool_types.go @@ -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. @@ -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 + // +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"`