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

SUS-564: Support AL 2023 #906

Draft
wants to merge 8 commits into
base: spectro-master
Choose a base branch
from
Draft

SUS-564: Support AL 2023 #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f83effd
support AL_2023
pavansokkenagaraj Nov 4, 2024
c1f53df
change AMIType default to AL2023_ARM_64_STANDARD
pavansokkenagaraj Nov 4, 2024
901f351
retain AMIType
pavansokkenagaraj Nov 7, 2024
f7b6089
add neuron/nvidia
pavansokkenagaraj Nov 7, 2024
3d1709f
hack: ret err when NodegroupStatusCreateFailed
pavansokkenagaraj Nov 8, 2024
7286384
go fmt
pavansokkenagaraj Nov 12, 2024
81a3077
revert tmp changes
pavansokkenagaraj Nov 12, 2024
a87c8b5
revert tmp
pavansokkenagaraj Nov 12, 2024
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
15 changes: 15 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 @@ -63,6 +63,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down Expand Up @@ -285,6 +290,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down Expand Up @@ -540,6 +550,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down
10 changes: 9 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,14 @@ 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"
// AL2023_x86_64_NVIDIA
Al2023x86_64Nvidia ManagedMachineAMIType = "AL2023_x86_64_NVIDIA"
// AL2023_x86_64_NEURON
Al2023x86_64Neuron ManagedMachineAMIType = "AL2023_x86_64_NEURON"
)

// ManagedMachinePoolCapacityType specifies the capacity type to be used for the managed MachinePool.
Expand Down Expand Up @@ -99,7 +107,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;AL2023_x86_64_NVIDIA;AL2023_x86_64_NEURON;CUSTOM
// +kubebuilder:default:=AL2_x86_64
// +optional
AMIType *ManagedMachineAMIType `json:"amiType,omitempty"`
Expand Down
15 changes: 15 additions & 0 deletions spectro/generated/core-global.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12558,6 +12558,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down Expand Up @@ -12780,6 +12785,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down Expand Up @@ -13035,6 +13045,11 @@ spec:
- AL2_x86_64
- AL2_x86_64_GPU
- AL2_ARM_64
- AL2023_x86_64_STANDARD
- AL2023_ARM_64_STANDARD
- AL2023_x86_64_NVIDIA
- AL2023_x86_64_NEURON
- CUSTOM
type: string
amiVersion:
description: AMIVersion defines the desired AMI release version. If
Expand Down