Merge pull request #825 from yiannistri/revert-790

Revert "Merge pull request #790 from mjura/gpu-v2.9"
rancher · Sep 12, 2024 · 710f4f9 · 710f4f9
2 parents bfd4eaa + 54a247a
commit 710f4f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/controller/external.go b/controller/external.go
@@ -207,8 +207,9 @@ func BuildUpstreamClusterState(ctx context.Context, name, managedTemplateID stri
 				ngToAdd.Ec2SshKey = ng.Nodegroup.RemoteAccess.Ec2SshKey
 			}
 		}
-
-		if ng.Nodegroup.AmiType == ekstypes.AMITypesAl2023X8664Nvidia {
+		// 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.AMITypesAl2023X8664Standard {
 			ngToAdd.Gpu = aws.Bool(false)

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

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