diff --git a/cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go b/cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go index 58e403f040..f6474798ed 100644 --- a/cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go +++ b/cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* 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 1914b742c8..3b4e76e87c 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml @@ -67,6 +67,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD - CUSTOM type: string amiVersion: @@ -541,6 +543,8 @@ spec: - AL2_x86_64 - AL2_x86_64_GPU - AL2_ARM_64 + - AL2023_x86_64_STANDARD + - AL2023_ARM_64_STANDARD - CUSTOM type: string amiVersion: diff --git a/docs/book/src/crd/index.md b/docs/book/src/crd/index.md index 52d7c52c53..4c456b22ce 100644 --- a/docs/book/src/crd/index.md +++ b/docs/book/src/crd/index.md @@ -17081,6 +17081,12 @@ int64

"AL2_x86_64_GPU"

Al2x86_64GPU is the x86-64 GPU AMI type.

+

"AL2023_ARM_64_STANDARD"

+

Al2023Arm64 is the AL2023 Arm AMI type.

+ +

"AL2023_x86_64_STANDARD"

+

Al2023x86_64 is the AL2023 x86 AMI type.

+

ManagedMachinePoolCapacityType diff --git a/exp/api/v1beta1/awsmanagedmachinepool_types.go b/exp/api/v1beta1/awsmanagedmachinepool_types.go index ec9f1ff3f5..48cee1e8cc 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;CUSTOM + // +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;CUSTOM // +kubebuilder:default:=AL2_x86_64 // +optional AMIType *ManagedMachineAMIType `json:"amiType,omitempty"` diff --git a/exp/api/v1beta2/awsmanagedmachinepool_types.go b/exp/api/v1beta2/awsmanagedmachinepool_types.go index a9fd346ba5..c7e70fcf55 100644 --- a/exp/api/v1beta2/awsmanagedmachinepool_types.go +++ b/exp/api/v1beta2/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. @@ -104,7 +108,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;CUSTOM + // +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;CUSTOM // +kubebuilder:default:=AL2_x86_64 // +optional AMIType *ManagedMachineAMIType `json:"amiType,omitempty"`