Skip to content

Commit e938009

Browse files
sombraSoftsombraSoft
authored
Update Google Cloud machine types (#478)
* Update machine types * remove extra line * add missing x4 machines
1 parent 05a618d commit e938009

File tree

1 file changed

+117
-71
lines changed

1 file changed

+117
-71
lines changed

‎rules/utils.go‎

Lines changed: 117 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -104,61 +104,63 @@ var validMachineTypes = map[string]bool{
104104
"c3d-highcpu-180": true,
105105
"c3d-highcpu-360": true,
106106
// C4
107-
"c4-standard-2": true,
108-
"c4-standard-4": true,
109-
"c4-standard-8": true,
110-
"c4-standard-16": true,
111-
"c4-standard-24": true,
112-
"c4-standard-32": true,
113-
"c4-standard-48": true,
114-
"c4-standard-96": true,
115-
"c4-standard-144": true,
116-
"c4-standard-192": true,
117-
"c4-standard-288": true,
118-
"c4-standard-288-metal": true,
119-
"c4-standard-4-lssd": true,
120-
"c4-standard-8-lssd": true,
121-
"c4-standard-16-lssd": true,
122-
"c4-standard-24-lssd": true,
123-
"c4-standard-32-lssd": true,
124-
"c4-standard-48-lssd": true,
125-
"c4-standard-96-lssd": true,
126-
"c4-standard-144-lssd": true,
127-
"c4-standard-192-lssd": true,
128-
"c4-standard-288-lssd": true,
129-
"c4-highcpu-2": true,
130-
"c4-highcpu-4": true,
131-
"c4-highcpu-8": true,
132-
"c4-highcpu-16": true,
133-
"c4-highcpu-24": true,
134-
"c4-highcpu-32": true,
135-
"c4-highcpu-48": true,
136-
"c4-highcpu-96": true,
137-
"c4-highcpu-144": true,
138-
"c4-highcpu-192": true,
139-
"c4-highcpu-288": true,
140-
"c4-highmem-2": true,
141-
"c4-highmem-4": true,
142-
"c4-highmem-8": true,
143-
"c4-highmem-16": true,
144-
"c4-highmem-24": true,
145-
"c4-highmem-32": true,
146-
"c4-highmem-48": true,
147-
"c4-highmem-96": true,
148-
"c4-highmem-144": true,
149-
"c4-highmem-192": true,
150-
"c4-highmem-288": true,
151-
"c4-highmem-288-metal": true,
152-
"c4-highmem-4-lssd": true,
153-
"c4-highmem-8-lssd": true,
154-
"c4-highmem-16-lssd": true,
155-
"c4-highmem-24-lssd": true,
156-
"c4-highmem-32-lssd": true,
157-
"c4-highmem-48-lssd": true,
158-
"c4-highmem-96-lssd": true,
159-
"c4-highmem-144-lssd": true,
160-
"c4-highmem-192-lssd": true,
161-
"c4-highmem-288-lssd": true,
107+
"c4-standard-2": true,
108+
"c4-standard-4": true,
109+
"c4-standard-8": true,
110+
"c4-standard-16": true,
111+
"c4-standard-24": true,
112+
"c4-standard-32": true,
113+
"c4-standard-48": true,
114+
"c4-standard-96": true,
115+
"c4-standard-144": true,
116+
"c4-standard-192": true,
117+
"c4-standard-288": true,
118+
"c4-standard-288-metal": true,
119+
"c4-standard-4-lssd": true,
120+
"c4-standard-8-lssd": true,
121+
"c4-standard-16-lssd": true,
122+
"c4-standard-24-lssd": true,
123+
"c4-standard-32-lssd": true,
124+
"c4-standard-48-lssd": true,
125+
"c4-standard-96-lssd": true,
126+
"c4-standard-144-lssd": true,
127+
"c4-standard-192-lssd": true,
128+
"c4-standard-288-lssd": true,
129+
"c4-standard-288-lssd-metal": true,
130+
"c4-highcpu-2": true,
131+
"c4-highcpu-4": true,
132+
"c4-highcpu-8": true,
133+
"c4-highcpu-16": true,
134+
"c4-highcpu-24": true,
135+
"c4-highcpu-32": true,
136+
"c4-highcpu-48": true,
137+
"c4-highcpu-96": true,
138+
"c4-highcpu-144": true,
139+
"c4-highcpu-192": true,
140+
"c4-highcpu-288": true,
141+
"c4-highmem-2": true,
142+
"c4-highmem-4": true,
143+
"c4-highmem-8": true,
144+
"c4-highmem-16": true,
145+
"c4-highmem-24": true,
146+
"c4-highmem-32": true,
147+
"c4-highmem-48": true,
148+
"c4-highmem-96": true,
149+
"c4-highmem-144": true,
150+
"c4-highmem-192": true,
151+
"c4-highmem-288": true,
152+
"c4-highmem-288-metal": true,
153+
"c4-highmem-4-lssd": true,
154+
"c4-highmem-8-lssd": true,
155+
"c4-highmem-16-lssd": true,
156+
"c4-highmem-24-lssd": true,
157+
"c4-highmem-32-lssd": true,
158+
"c4-highmem-48-lssd": true,
159+
"c4-highmem-96-lssd": true,
160+
"c4-highmem-288-lssd": true,
161+
"c4-highmem-144-lssd": true,
162+
"c4-highmem-192-lssd": true,
163+
"c4-highmem-288-lssd-metal": true,
162164
// C4D
163165
"c4d-standard-2": true,
164166
"c4d-standard-4": true,
@@ -276,7 +278,9 @@ var validMachineTypes = map[string]bool{
276278
// H3
277279
"h3-standard-88": true,
278280
// H4D
281+
"h4d-highmem-192": true,
279282
"h4d-highmem-192-lssd": true,
283+
"h4d-standard-192": true,
280284
// M1
281285
"m1-megamem-96": true,
282286
"m1-ultramem-40": true,
@@ -417,7 +421,35 @@ var validMachineTypes = map[string]bool{
417421
"n4-highmem-32": true,
418422
"n4-highmem-48": true,
419423
"n4-highmem-64": true,
420-
"n4-highmem-80": true,
424+
"n4-highmem-80": true,
425+
// N4D
426+
"n4d-standard-2": true,
427+
"n4d-standard-4": true,
428+
"n4d-standard-8": true,
429+
"n4d-standard-16": true,
430+
"n4d-standard-32": true,
431+
"n4d-standard-48": true,
432+
"n4d-standard-64": true,
433+
"n4d-standard-80": true,
434+
"n4d-standard-96": true,
435+
"n4d-highcpu-2": true,
436+
"n4d-highcpu-4": true,
437+
"n4d-highcpu-8": true,
438+
"n4d-highcpu-16": true,
439+
"n4d-highcpu-32": true,
440+
"n4d-highcpu-48": true,
441+
"n4d-highcpu-64": true,
442+
"n4d-highcpu-80": true,
443+
"n4d-highcpu-96": true,
444+
"n4d-highmem-2": true,
445+
"n4d-highmem-4": true,
446+
"n4d-highmem-8": true,
447+
"n4d-highmem-16": true,
448+
"n4d-highmem-32": true,
449+
"n4d-highmem-48": true,
450+
"n4d-highmem-64": true,
451+
"n4d-highmem-80": true,
452+
"n4d-highmem-96": true,
421453

422454
// T2
423455
"t2a-standard-1": true,
@@ -454,13 +486,15 @@ var validMachineTypes = map[string]bool{
454486
"a2-ultragpu-8g": true,
455487

456488
// H100 machine types: https://cloud.google.com/compute/docs/gpus#h100-gpus
457-
"a3-highgpu-1g": true,
458-
"a3-highgpu-2g": true,
459-
"a3-highgpu-4g": true,
460-
"a3-highgpu-8g": true,
461-
"a3-megagpu-8g": true,
462-
"a3-ultragpu-8g": true,
463-
"a3-edgegpu-8g": true,
489+
"a3-highgpu-1g": true,
490+
"a3-highgpu-2g": true,
491+
"a3-highgpu-4g": true,
492+
"a3-highgpu-8g": true,
493+
"a3-megagpu-8g": true,
494+
"a3-ultragpu-8g": true,
495+
"a3-ultragpu-8g-nolssd": true,
496+
"a3-edgegpu-8g": true,
497+
"a3-edgegpu-8g-nolssd": true,
464498

465499
// A4
466500
"a4-highgpu-8g": true,
@@ -478,13 +512,20 @@ var validMachineTypes = map[string]bool{
478512
"g2-standard-96": true,
479513

480514
// CT TPU machine types https://cloud.google.com/tpu/docs/tpus-in-gke
481-
"ct4p-hightpu-4t": true,
482-
"ct5l-hightpu-1t": true,
483-
"ct5l-hightpu-4t": true,
484-
"ct5l-hightpu-8t": true,
485-
"ct5lp-hightpu-1t": true,
486-
"ct5lp-hightpu-4t": true,
487-
"ct5lp-hightpu-8t": true,
515+
"ct3-hightpu-4t": true,
516+
"ct3p-hightpu-4t": true,
517+
"ct4p-hightpu-4t": true,
518+
"ct5l-hightpu-1t": true,
519+
"ct5l-hightpu-4t": true,
520+
"ct5l-hightpu-8t": true,
521+
"ct5lp-hightpu-1t": true,
522+
"ct5lp-hightpu-4t": true,
523+
"ct5lp-hightpu-8t": true,
524+
"ct5p-hightpu-4t": true,
525+
"ct6e-standard-1t": true,
526+
"ct6e-standard-4t": true,
527+
"ct6e-standard-8t": true,
528+
"tpu7x-standard-4t": true,
488529

489530
// Z3
490531
"z3-highmem-14-standardlssd": true,
@@ -504,9 +545,13 @@ var validMachineTypes = map[string]bool{
504545
"z3-highmem-176-highlssd": true,
505546

506547
// X4 machine types: https://cloud.google.com/compute/docs/memory-optimized-machines#x4_machine_types
507-
"x4-megamem-960-metal": true,
548+
"x4-1440-24t-metal": true,
549+
"x4-1920-32t-metal": true,
508550
"x4-megamem-1440-metal": true,
509551
"x4-megamem-1920-metal": true,
552+
"x4-megamem-960-metal": true,
553+
"x4-960-12t-metal": true,
554+
"x4-960-16t-metal": true,
510555
}
511556

512557
func isCustomType(machineType string) bool {
@@ -515,6 +560,7 @@ func isCustomType(machineType string) bool {
515560
strings.HasPrefix(machineType, "n2d-custom-") ||
516561
strings.HasPrefix(machineType, "n1-custom-") ||
517562
strings.HasPrefix(machineType, "n4-custom-") ||
563+
strings.HasPrefix(machineType, "n4d-custom-") ||
518564
strings.HasPrefix(machineType, "custom-")
519565
}
520566

0 commit comments

Comments
 (0)