Merge pull request #581 from mjura/v2.9-ami2023

[v2.9] Change default AMI type to Amazon Linux 2023
rancher · Jun 5, 2024 · d4fa9da · d4fa9da
2 parents 1d29618 + ecaf2ff
commit d4fa9da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/controller/external.go b/controller/external.go
@@ -196,11 +196,13 @@ func BuildUpstreamClusterState(ctx context.Context, name, managedTemplateID stri
 				ngToAdd.Ec2SshKey = ng.Nodegroup.RemoteAccess.Ec2SshKey
 			}
 		}
+		// TODO: Update AMITypesAl2X8664Gpu to Amazon Linux 2023 when it is available
+		// Issue https://github.com/rancher/eks-operator/issues/568
 		if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2X8664Gpu {
 			ngToAdd.Gpu = aws.Bool(true)
-		} else if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2X8664 {
+		} else if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2023X8664Standard {
 			ngToAdd.Gpu = aws.Bool(false)
-		} else if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2Arm64 {
+		} else if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2023Arm64Standard {
 			ngToAdd.Arm = aws.Bool(true)
 		}
 		upstreamSpec.NodeGroups = append(upstreamSpec.NodeGroups, ngToAdd)

diff --git a/pkg/eks/create.go b/pkg/eks/create.go
@@ -279,11 +279,11 @@ func CreateNodeGroup(ctx context.Context, opts *CreateNodeGroupOptions) (string,
 		if opts.NodeGroup.LaunchTemplate != nil {
 			nodeGroupCreateInput.AmiType = ekstypes.AMITypesCustom
 		} else if arm := opts.NodeGroup.Arm; aws.ToBool(arm) {
-			nodeGroupCreateInput.AmiType = ekstypes.AMITypesAl2Arm64
+			nodeGroupCreateInput.AmiType = ekstypes.AMITypesAl2023Arm64Standard
 		} else if gpu := opts.NodeGroup.Gpu; aws.ToBool(gpu) {
 			nodeGroupCreateInput.AmiType = ekstypes.AMITypesAl2X8664Gpu
 		} else {
-			nodeGroupCreateInput.AmiType = ekstypes.AMITypesAl2X8664
+			nodeGroupCreateInput.AmiType = ekstypes.AMITypesAl2023X8664Standard
 		}
 	}
 

diff --git a/pkg/eks/create_test.go b/pkg/eks/create_test.go
@@ -1012,7 +1012,7 @@ var _ = Describe("CreateNodeGroup", func() {
 			InstanceTypes: createNodeGroupOpts.NodeGroup.SpotInstanceTypes,
 			Subnets:       createNodeGroupOpts.NodeGroup.Subnets,
 			NodeRole:      aws.String("test"),
-			AmiType:       ekstypes.AMITypesAl2Arm64,
+			AmiType:       ekstypes.AMITypesAl2023Arm64Standard,
 		}).Return(nil, nil)
 
 		launchTemplateVersion, generatedNodeRole, err := CreateNodeGroup(ctx, createNodeGroupOpts)
@@ -1066,7 +1066,7 @@ var _ = Describe("CreateNodeGroup", func() {
 			InstanceTypes: createNodeGroupOpts.NodeGroup.SpotInstanceTypes,
 			Subnets:       createNodeGroupOpts.NodeGroup.Subnets,
 			NodeRole:      aws.String("test"),
-			AmiType:       ekstypes.AMITypesAl2X8664,
+			AmiType:       ekstypes.AMITypesAl2023X8664Standard,
 		}).Return(nil, nil)
 
 		launchTemplateVersion, generatedNodeRole, err := CreateNodeGroup(ctx, createNodeGroupOpts)