From 7aed417af0cda1c7e95ee55566790b2a7eca4eed Mon Sep 17 00:00:00 2001 From: Amit Sahastrabuddhe Date: Thu, 19 Jun 2025 11:05:30 +0530 Subject: [PATCH 1/3] Add support for AL2023 CRDs --- api/v1beta1/types.go | 2 +- api/v1beta2/types.go | 2 +- .../infrastructure.cluster.x-k8s.io_awsmachinepools.yaml | 4 ++++ .../bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml | 4 ++++ .../infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml | 4 ++++ ...nfrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml | 4 ++++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index fe6510380b..96817319c5 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -51,7 +51,7 @@ type AMIReference struct { ID *string `json:"id,omitempty"` // EKSOptimizedLookupType If specified, will look up an EKS Optimized image in SSM Parameter store - // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU + // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU;AmazonLinux2023;AmazonLinux2023GPU // +optional EKSOptimizedLookupType *EKSAMILookupType `json:"eksLookupType,omitempty"` } diff --git a/api/v1beta2/types.go b/api/v1beta2/types.go index 481ac7dd75..9c3c2771c9 100644 --- a/api/v1beta2/types.go +++ b/api/v1beta2/types.go @@ -54,7 +54,7 @@ type AMIReference struct { ID *string `json:"id,omitempty"` // EKSOptimizedLookupType If specified, will look up an EKS Optimized image in SSM Parameter store - // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU + // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU;AmazonLinux2023;AmazonLinux2023GPU // +optional EKSOptimizedLookupType *EKSAMILookupType `json:"eksLookupType,omitempty"` } diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml index 935396765d..c6fdd782b5 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinepools.yaml @@ -131,6 +131,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource @@ -624,6 +626,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml index 5baacc3e2f..3bb1fe589f 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml @@ -127,6 +127,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource @@ -615,6 +617,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml index 40cf10944a..a6a5aa63d3 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml @@ -140,6 +140,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource @@ -549,6 +551,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource 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 44355f22bc..17001f93bd 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml @@ -140,6 +140,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource @@ -620,6 +622,8 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU + - AmazonLinux2023 + - AmazonLinux2023GPU type: string id: description: ID of resource From 6a123975f2f8f3ee9c99d3c97e4e79d502888fa9 Mon Sep 17 00:00:00 2001 From: Amit Sahastrabuddhe <33931378+AmitSahastra@users.noreply.github.com> Date: Thu, 26 Jun 2025 13:26:18 +0530 Subject: [PATCH 2/3] Update types.go --- api/v1beta1/types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/v1beta1/types.go b/api/v1beta1/types.go index 96817319c5..fe6510380b 100644 --- a/api/v1beta1/types.go +++ b/api/v1beta1/types.go @@ -51,7 +51,7 @@ type AMIReference struct { ID *string `json:"id,omitempty"` // EKSOptimizedLookupType If specified, will look up an EKS Optimized image in SSM Parameter store - // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU;AmazonLinux2023;AmazonLinux2023GPU + // +kubebuilder:validation:Enum:=AmazonLinux;AmazonLinuxGPU // +optional EKSOptimizedLookupType *EKSAMILookupType `json:"eksLookupType,omitempty"` } From 63707b9250f388944f6a1beb7fb1d6729a13436d Mon Sep 17 00:00:00 2001 From: Amit Sahastrabuddhe Date: Thu, 26 Jun 2025 13:35:32 +0530 Subject: [PATCH 3/3] remove v1beta api changes --- .../crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml | 2 -- .../infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml | 2 -- 2 files changed, 4 deletions(-) diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml index 3bb1fe589f..6e32bfcb65 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachines.yaml @@ -127,8 +127,6 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU - - AmazonLinux2023 - - AmazonLinux2023GPU type: string id: description: ID of resource diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml index a6a5aa63d3..634e7eec24 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmachinetemplates.yaml @@ -140,8 +140,6 @@ spec: enum: - AmazonLinux - AmazonLinuxGPU - - AmazonLinux2023 - - AmazonLinux2023GPU type: string id: description: ID of resource