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

Revert "Merge pull request #790 from mjura/gpu-v2.9" #825

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Revert "Merge pull request #790 from mjura/gpu-v2.9" #825

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
5 changes: 3 additions & 2 deletions controller/external.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/eks/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading