From f83effdb9f4e0531a9fe2151dd854e790ea39873 Mon Sep 17 00:00:00 2001 From: Pavan Sokke Nagaraj Date: Mon, 4 Nov 2024 08:31:02 -0500 Subject: [PATCH] support AL_2023 --- ...rastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml | 6 ++++++ exp/api/v1beta1/awsmanagedmachinepool_types.go | 6 +++++- spectro/generated/core-global.yaml | 6 ++++++ 3 files changed, 17 insertions(+), 1 deletion(-) 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 b306b9bd4b..a665907c33 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml @@ -63,6 +63,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If @@ -285,6 +287,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If @@ -540,6 +544,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If diff --git a/exp/api/v1beta1/awsmanagedmachinepool_types.go b/exp/api/v1beta1/awsmanagedmachinepool_types.go index e6e95d9a14..2ffb195b3b 100644 --- a/exp/api/v1beta1/awsmanagedmachinepool_types.go +++ b/exp/api/v1beta1/awsmanagedmachinepool_types.go @@ -37,6 +37,10 @@ const ( Al2x86_64GPU ManagedMachineAMIType = "AL2_x86_64_GPU" // Al2Arm64 is the Arm AMI type. Al2Arm64 ManagedMachineAMIType = "AL2_ARM_64" + // Al2023x86_64 is the AL2023 x86-64 AMI type. + Al2023x86_64 ManagedMachineAMIType = "AL2023_x86_64_STANDARD" + // Al2023Arm64 is the AL2023 Arm AMI type. + Al2023Arm64 ManagedMachineAMIType = "AL2023_ARM_64_STANDARD" ) // ManagedMachinePoolCapacityType specifies the capacity type to be used for the managed MachinePool. @@ -99,7 +103,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 + // +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD // +kubebuilder:default:=AL2_x86_64 // +optional AMIType *ManagedMachineAMIType `json:"amiType,omitempty"` diff --git a/spectro/generated/core-global.yaml b/spectro/generated/core-global.yaml index ec22856eec..f765599516 100644 --- a/spectro/generated/core-global.yaml +++ b/spectro/generated/core-global.yaml @@ -12558,6 +12558,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If @@ -12780,6 +12782,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If @@ -13035,6 +13039,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD type: string amiVersion: description: AMIVersion defines the desired AMI release version. If