Skip to content

Fix issue installing the nvidia device plugin unconditionally on al2023 #8225

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

Merged
bryantbiggs merged 1 commit into from
Feb 19, 2025
Merged

Fix issue installing the nvidia device plugin unconditionally on al2023 #8225

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
8 changes: 4 additions & 4 deletions pkg/eks/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ func (c *ClusterProvider) ClusterTasksForNodeGroups(cfg *api.ClusterConfig, inst
// Only AL2/AL2023 requires the NVIDIA device plugin
clusterRequiresNvidiaDevicePlugin = clusterRequiresNvidiaDevicePlugin ||
(api.HasInstanceType(ng, instanceutils.IsNvidiaInstanceType) &&
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2 ||
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2023)
(ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2 ||
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2023))
efaEnabled = efaEnabled || api.IsEnabled(ng.EFAEnabled)
}
for _, ng := range cfg.ManagedNodeGroups {
Expand All @@ -352,8 +352,8 @@ func (c *ClusterProvider) ClusterTasksForNodeGroups(cfg *api.ClusterConfig, inst
// Only AL2/AL2023 requires the NVIDIA device plugin
clusterRequiresNvidiaDevicePlugin = clusterRequiresNvidiaDevicePlugin ||
(api.HasInstanceTypeManaged(ng, instanceutils.IsNvidiaInstanceType) &&
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2 ||
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2023)
(ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2 ||
ng.GetAMIFamily() == api.NodeImageFamilyAmazonLinux2023))
efaEnabled = efaEnabled || api.IsEnabled(ng.EFAEnabled)
}
if clusterRequiresNeuronDevicePlugin {
Expand Down
183 changes: 183 additions & 0 deletions pkg/eks/tasks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
package eks

import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
)

var _ = Describe("ClusterTasksForNodeGroups", func() {
type testCase struct {
nodeGroups []*v1alpha5.NodeGroup
managedNodeGroups []*v1alpha5.ManagedNodeGroup
expectedTaskCount int
expectedTaskKind []string
installNeuron bool
installNvidia bool
}

testCases := []testCase{
{
// tasks related to both neuron and nvidia device plugin should be created
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "p2.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "inf1.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
expectedTaskCount: 2,
expectedTaskKind: []string{"Neuron", "Nvidia"},
installNeuron: true,
installNvidia: true,
},
{
// tasks related to both neuron and nvidia device plugin should NOT be created
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "p2.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "inf1.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
expectedTaskCount: 0,
expectedTaskKind: []string{},
installNeuron: false,
installNvidia: false,
},
{
// tasks related to either neuron and nvidia device plugin should NOT be created as the
// instance type does not have supporte either GPU type
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "r7a.large",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "r7a.large",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
expectedTaskCount: 0,
expectedTaskKind: []string{},
installNeuron: true,
installNvidia: true,
},
{
// tasks related to either neuron and nvidia device plugin should NOT be created as the
// instance type does not have supporte either GPU type
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "g6e.48xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "g6e.48xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
expectedTaskCount: 1,
expectedTaskKind: []string{"Nvidia"},
installNeuron: true,
installNvidia: true,
},
{
// tasks related to both neuron and nvidia device plugin should be created
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "p2.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "inf1.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
expectedTaskCount: 2,
expectedTaskKind: []string{"Neuron", "Nvidia"},
installNeuron: true,
installNvidia: true,
},
{
// tasks related to both neuron and nvidia device plugin should NOT be created
nodeGroups: []*v1alpha5.NodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "p2.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
managedNodeGroups: []*v1alpha5.ManagedNodeGroup{
{
NodeGroupBase: &v1alpha5.NodeGroupBase{
InstanceType: "inf1.xlarge",
AMIFamily: v1alpha5.NodeImageFamilyAmazonLinux2023,
},
},
},
expectedTaskCount: 0,
expectedTaskKind: []string{},
installNeuron: false,
installNvidia: false,
},
}

for _, tc := range testCases {
tc := tc // capture range variable
It("returns the expected tasks", func() {
provider := mockprovider.NewMockProvider()
cfg := &v1alpha5.ClusterConfig{
NodeGroups: tc.nodeGroups,
ManagedNodeGroups: tc.managedNodeGroups,
}
clusterProvider := &ClusterProvider{
AWSProvider: provider,
}
clusterTasks := clusterProvider.ClusterTasksForNodeGroups(cfg, tc.installNeuron, tc.installNvidia)
Expect(clusterTasks).NotTo(BeNil())
Expect(clusterTasks.Tasks).To(HaveLen(tc.expectedTaskCount))
for i, task := range clusterTasks.Tasks {
devicePluginTask, _ := task.(*devicePluginTask)
Expect(devicePluginTask.kind).To(Equal(tc.expectedTaskKind[i]))
}
})
}
})
Loading