Merge pull request #7819 from practicusai/g6-support

Added AWS G6 GPU instance support
eksctl-io · Jun 6, 2024 · 68695db · 68695db
2 parents 4ee5579 + 7aade08
commit 68695db
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/pkg/addons/assets/efa-device-plugin.yaml b/pkg/addons/assets/efa-device-plugin.yaml
@@ -56,6 +56,11 @@ spec:
                       - g4dn.8xlarge
                       - g4dn.metal
                       - g5.48xlarge
+                      - g6.8xlarge
+                      - g6.12xlarge
+                      - g6.16xlarge
+                      - g6.24xlarge
+                      - g6.48xlarge
                       - hpc6a.48xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge
@@ -113,6 +118,11 @@ spec:
                       - g4dn.8xlarge
                       - g4dn.metal
                       - g5.48xlarge
+                      - g6.8xlarge
+                      - g6.12xlarge
+                      - g6.16xlarge
+                      - g6.24xlarge
+                      - g6.48xlarge
                       - hpc6a.48xlarge
                       - i3en.12xlarge
                       - i3en.24xlarge

diff --git a/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go b/pkg/apis/eksctl.io/v1alpha5/gpu_validation_test.go
@@ -61,6 +61,10 @@ var _ = Describe("GPU instance support", func() {
 			gpuInstanceType: "asdf",
 			amiFamily:       api.NodeImageFamilyAmazonLinux2,
 		}),
+		Entry("AL2", gpuInstanceEntry{
+			gpuInstanceType: "g6.12xlarge",
+			amiFamily:       api.NodeImageFamilyAmazonLinux2,
+		}),
 		Entry("AL2", gpuInstanceEntry{
 			gpuInstanceType: "g5.12xlarge",
 			amiFamily:       api.NodeImageFamilyAmazonLinux2,
@@ -124,6 +128,10 @@ var _ = Describe("GPU instance support", func() {
 			gpuInstanceType: "g4dn.xlarge",
 			amiFamily:       api.NodeImageFamilyAmazonLinux2,
 		}),
+		Entry("AL2", gpuInstanceEntry{
+			gpuInstanceType: "g6.12xlarge",
+			amiFamily:       api.NodeImageFamilyAmazonLinux2,
+		}),
 		Entry("AL2", gpuInstanceEntry{
 			gpuInstanceType: "g5.12xlarge",
 			amiFamily:       api.NodeImageFamilyAmazonLinux2,

diff --git a/pkg/utils/instance/instance.go b/pkg/utils/instance/instance.go
@@ -49,7 +49,8 @@ func IsNvidiaInstanceType(instanceType string) bool {
 		strings.HasPrefix(instanceType, "p5") ||
 		strings.HasPrefix(instanceType, "g3") ||
 		strings.HasPrefix(instanceType, "g4") ||
-		strings.HasPrefix(instanceType, "g5")
+		strings.HasPrefix(instanceType, "g5") ||
+		strings.HasPrefix(instanceType, "g6")
 }
 
 // IsInferentiaInstanceType returns true if the instance type requires AWS Neuron