@@ -51,6 +51,10 @@ var _ = Describe("GPU instance support", func() {
5151 amiFamily : api .NodeImageFamilyAmazonLinux2023 ,
5252 gpuInstanceType : "g4dn.xlarge" ,
5353 }),
54+ Entry ("AL2023 ARM NVIDIA" , gpuInstanceEntry {
55+ amiFamily : api .NodeImageFamilyAmazonLinux2023 ,
56+ gpuInstanceType : "g5g.2xlarge" ,
57+ }),
5458 Entry ("AL2" , gpuInstanceEntry {
5559 gpuInstanceType : "asdf" ,
5660 amiFamily : api .NodeImageFamilyAmazonLinux2 ,
@@ -96,7 +100,6 @@ var _ = Describe("GPU instance support", func() {
96100 ng .InstanceType = e .gpuInstanceType
97101 ng .AMIFamily = e .amiFamily
98102 assertValidationError (e , api .ValidateNodeGroup (0 , ng , api .NewClusterConfig ()))
99-
100103 },
101104 Entry ("AL2023 INF" , gpuInstanceEntry {
102105 amiFamily : api .NodeImageFamilyAmazonLinux2023 ,
@@ -110,6 +113,10 @@ var _ = Describe("GPU instance support", func() {
110113 amiFamily : api .NodeImageFamilyAmazonLinux2023 ,
111114 gpuInstanceType : "g4dn.xlarge" ,
112115 }),
116+ Entry ("AL2023 ARM NVIDIA" , gpuInstanceEntry {
117+ amiFamily : api .NodeImageFamilyAmazonLinux2023 ,
118+ gpuInstanceType : "g5g.2xlarge" ,
119+ }),
113120 Entry ("AL2" , gpuInstanceEntry {
114121 gpuInstanceType : "g4dn.xlarge" ,
115122 amiFamily : api .NodeImageFamilyAmazonLinux2 ,
@@ -244,16 +251,11 @@ var _ = Describe("GPU instance support", func() {
244251 amiFamily := api .NodeImageFamilyAmazonLinux2023
245252 instanceType := "g5g.2xlarge"
246253
247- ngFail := api .NewNodeGroup ()
248- ngFail .AMIFamily = amiFamily
249- ngFail .InstanceType = instanceType
250-
251254 ngPass := api .NewNodeGroup ()
252255 ngPass .AMIFamily = amiFamily
253256 ngPass .InstanceType = instanceType
254257 ngPass .AMI = "ami-xxxx"
255258
256- Expect (api .ValidateNodeGroup (0 , ngFail , api .NewClusterConfig ())).To (HaveOccurred ())
257259 Expect (api .ValidateNodeGroup (0 , ngPass , api .NewClusterConfig ())).NotTo (HaveOccurred ())
258260 })
259261
@@ -263,14 +265,14 @@ var _ = Describe("GPU instance support", func() {
263265 ng .AMIFamily = amiFamily
264266 err := api .ValidateNodeGroup (0 , ng , api .NewClusterConfig ())
265267 if expectErr {
266- Expect (err ).To (MatchError (fmt .Sprintf ("ARM GPU instance types are not supported for unmanaged nodegroups with AMIFamily %s" , amiFamily )))
268+ Expect (err ).To (MatchError (fmt .Sprintf ("%s instance types are not supported for unmanaged nodegroups with AMIFamily %s" , ng . InstanceType , amiFamily )))
267269 } else {
268270 Expect (err ).NotTo (HaveOccurred ())
269271 }
270272 },
271273 Entry ("AmazonLinux2" , api .NodeImageFamilyAmazonLinux2 , true ),
272- Entry ("AmazonLinux2023" , api .NodeImageFamilyAmazonLinux2023 , true ),
273- Entry ("Ubuntu2004" , api .NodeImageFamilyUbuntu2004 , true ),
274+ Entry ("AmazonLinux2023" , api .NodeImageFamilyAmazonLinux2023 , false ),
275+ Entry ("Ubuntu2004" , api .NodeImageFamilyUbuntu2004 , false ),
274276 Entry ("Windows2019Full" , api .NodeImageFamilyWindowsServer2019FullContainer , true ),
275277 Entry ("Windows2019Core" , api .NodeImageFamilyWindowsServer2019CoreContainer , true ),
276278 Entry ("Bottlerocket" , api .NodeImageFamilyBottlerocket , false ),
0 commit comments