Skip to content

Commit 798e8d0

Browse files
dntosask8s-infra-cherrypick-robot
authored and
k8s-infra-cherrypick-robot
committed
feat(ami): add support for AL2023 type
Signed-off-by: dntosas <[email protected]>
1 parent fb221b1 commit 798e8d0

File tree

5 files changed

+21
-2
lines changed

5 files changed

+21
-2
lines changed

cmd/clusterawsadm/api/ami/v1beta1/zz_generated.defaults.go

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/infrastructure.cluster.x-k8s.io_awsmanagedmachinepools.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ spec:
6767
- AL2_x86_64
6868
- AL2_x86_64_GPU
6969
- AL2_ARM_64
70+
- AL2023_x86_64_STANDARD
71+
- AL2023_ARM_64_STANDARD
7072
- CUSTOM
7173
type: string
7274
amiVersion:
@@ -541,6 +543,8 @@ spec:
541543
- AL2_x86_64
542544
- AL2_x86_64_GPU
543545
- AL2_ARM_64
546+
- AL2023_x86_64_STANDARD
547+
- AL2023_ARM_64_STANDARD
544548
- CUSTOM
545549
type: string
546550
amiVersion:

docs/book/src/crd/index.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17081,6 +17081,12 @@ int64
1708117081
</tr><tr><td><p>&#34;AL2_x86_64_GPU&#34;</p></td>
1708217082
<td><p>Al2x86_64GPU is the x86-64 GPU AMI type.</p>
1708317083
</td>
17084+
<tr><td><p>&#34;AL2023_ARM_64_STANDARD&#34;</p></td>
17085+
<td><p>Al2023Arm64 is the AL2023 Arm AMI type.</p>
17086+
</td>
17087+
</tr><tr><td><p>&#34;AL2023_x86_64_STANDARD&#34;</p></td>
17088+
<td><p>Al2023x86_64 is the AL2023 x86 AMI type.</p>
17089+
</td>
1708417090
</tr></tbody>
1708517091
</table>
1708617092
<h3 id="infrastructure.cluster.x-k8s.io/v1beta1.ManagedMachinePoolCapacityType">ManagedMachinePoolCapacityType

exp/api/v1beta1/awsmanagedmachinepool_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ const (
3737
Al2x86_64GPU ManagedMachineAMIType = "AL2_x86_64_GPU"
3838
// Al2Arm64 is the Arm AMI type.
3939
Al2Arm64 ManagedMachineAMIType = "AL2_ARM_64"
40+
// Al2023x86_64 is the AL2023 x86-64 AMI type.
41+
Al2023x86_64 ManagedMachineAMIType = "AL2023_x86_64_STANDARD"
42+
// Al2023Arm64 is the AL2023 Arm AMI type.
43+
Al2023Arm64 ManagedMachineAMIType = "AL2023_ARM_64_STANDARD"
4044
)
4145

4246
// ManagedMachinePoolCapacityType specifies the capacity type to be used for the managed MachinePool.
@@ -99,7 +103,7 @@ type AWSManagedMachinePoolSpec struct {
99103
AMIVersion *string `json:"amiVersion,omitempty"`
100104

101105
// AMIType defines the AMI type
102-
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;CUSTOM
106+
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;CUSTOM
103107
// +kubebuilder:default:=AL2_x86_64
104108
// +optional
105109
AMIType *ManagedMachineAMIType `json:"amiType,omitempty"`

exp/api/v1beta2/awsmanagedmachinepool_types.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ const (
3737
Al2x86_64GPU ManagedMachineAMIType = "AL2_x86_64_GPU"
3838
// Al2Arm64 is the Arm AMI type.
3939
Al2Arm64 ManagedMachineAMIType = "AL2_ARM_64"
40+
// Al2023x86_64 is the AL2023 x86-64 AMI type.
41+
Al2023x86_64 ManagedMachineAMIType = "AL2023_x86_64_STANDARD"
42+
// Al2023Arm64 is the AL2023 Arm AMI type.
43+
Al2023Arm64 ManagedMachineAMIType = "AL2023_ARM_64_STANDARD"
4044
)
4145

4246
// ManagedMachinePoolCapacityType specifies the capacity type to be used for the managed MachinePool.
@@ -104,7 +108,7 @@ type AWSManagedMachinePoolSpec struct {
104108
AMIVersion *string `json:"amiVersion,omitempty"`
105109

106110
// AMIType defines the AMI type
107-
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;CUSTOM
111+
// +kubebuilder:validation:Enum:=AL2_x86_64;AL2_x86_64_GPU;AL2_ARM_64;AL2023_x86_64_STANDARD;AL2023_ARM_64_STANDARD;CUSTOM
108112
// +kubebuilder:default:=AL2_x86_64
109113
// +optional
110114
AMIType *ManagedMachineAMIType `json:"amiType,omitempty"`

0 commit comments

Comments
 (0)