Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-2.5] ✨ feat(ami): add support for AL2023 type #4973

Merged
merged 1 commit into from
May 20, 2024
Merged

[release-2.5] ✨ feat(ami): add support for AL2023 type #4973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 6 additions & 0 deletions docs/book/src/crd/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17081,6 +17081,12 @@ int64
</tr><tr><td><p>&#34;AL2_x86_64_GPU&#34;</p></td>
<td><p>Al2x86_64GPU is the x86-64 GPU AMI type.</p>
</td>
<tr><td><p>&#34;AL2023_ARM_64_STANDARD&#34;</p></td>
<td><p>Al2023Arm64 is the AL2023 Arm AMI type.</p>
</td>
</tr><tr><td><p>&#34;AL2023_x86_64_STANDARD&#34;</p></td>
<td><p>Al2023x86_64 is the AL2023 x86 AMI type.</p>
</td>
</tr></tbody>
</table>
<h3 id="infrastructure.cluster.x-k8s.io/v1beta1.ManagedMachinePoolCapacityType">ManagedMachinePoolCapacityType
Expand Down
6 changes: 5 additions & 1 deletion exp/api/v1beta1/awsmanagedmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"`
Expand Down
6 changes: 5 additions & 1 deletion exp/api/v1beta2/awsmanagedmachinepool_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"`
Expand Down