From 6dd5a5443f7bc63ed50f1dfe5c889ae10f247775 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 949d48da9f..477ec0a850 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 14c9ed7c29..681d2c3b4f 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 0c3a66312d..138958b64e 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 f4a978b134..13acbf03e9 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 377613bf87220194f6349436802147c1bf95e559 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 8b4342697d3fe0114353be19f5f4dcecbd24c50e 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 681d2c3b4f..82b7d039e6 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 138958b64e..da3ce4d698 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