From 79272ae2b4824aec6616b10353f688a104ce4ed2 Mon Sep 17 00:00:00 2001
From: Joe North <jbnorth@amazon.com>
Date: Thu, 11 Sep 2025 12:25:10 -0400
Subject: [PATCH] Updated AWS static instance list - 09/11/2025

---
 .../cloudprovider/aws/ec2_instance_types.go   | 527 ++++++++++++++++--
 1 file changed, 491 insertions(+), 36 deletions(-)

diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
index 6e446e2f48f6..b18cf84a997b 100644
--- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
+++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
@@ -28,7 +28,7 @@ type InstanceType struct {
 }
 
 // StaticListLastUpdateTime is a string declaring the last time the static list was updated.
-var StaticListLastUpdateTime = "2025-05-27"
+var StaticListLastUpdateTime = "2025-09-11"
 
 // InstanceTypes is a map of ec2 resources
 var InstanceTypes = map[string]*InstanceType{
@@ -1481,6 +1481,90 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
+	"c8gn.12xlarge": {
+		InstanceType: "c8gn.12xlarge",
+		VCPU:         48,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.16xlarge": {
+		InstanceType: "c8gn.16xlarge",
+		VCPU:         64,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.24xlarge": {
+		InstanceType: "c8gn.24xlarge",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.2xlarge": {
+		InstanceType: "c8gn.2xlarge",
+		VCPU:         8,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.48xlarge": {
+		InstanceType: "c8gn.48xlarge",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.4xlarge": {
+		InstanceType: "c8gn.4xlarge",
+		VCPU:         16,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.8xlarge": {
+		InstanceType: "c8gn.8xlarge",
+		VCPU:         32,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.large": {
+		InstanceType: "c8gn.large",
+		VCPU:         2,
+		MemoryMb:     4096,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.medium": {
+		InstanceType: "c8gn.medium",
+		VCPU:         1,
+		MemoryMb:     2048,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.metal-24xl": {
+		InstanceType: "c8gn.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.metal-48xl": {
+		InstanceType: "c8gn.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"c8gn.xlarge": {
+		InstanceType: "c8gn.xlarge",
+		VCPU:         4,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "arm64",
+	},
 	"d2.2xlarge": {
 		InstanceType: "d2.2xlarge",
 		VCPU:         8,
@@ -1922,6 +2006,34 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          1,
 		Architecture: "amd64",
 	},
+	"g6f.2xlarge": {
+		InstanceType: "g6f.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"g6f.4xlarge": {
+		InstanceType: "g6f.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"g6f.large": {
+		InstanceType: "g6f.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"g6f.xlarge": {
+		InstanceType: "g6f.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"gr6.4xlarge": {
 		InstanceType: "gr6.4xlarge",
 		VCPU:         16,
@@ -1936,6 +2048,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          1,
 		Architecture: "amd64",
 	},
+	"gr6f.4xlarge": {
+		InstanceType: "gr6f.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"h1.16xlarge": {
 		InstanceType: "h1.16xlarge",
 		VCPU:         64,
@@ -2048,13 +2167,6 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"i3.metal": {
-		InstanceType: "i3.metal",
-		VCPU:         72,
-		MemoryMb:     524288,
-		GPU:          0,
-		Architecture: "amd64",
-	},
 	"i3.xlarge": {
 		InstanceType: "i3.xlarge",
 		VCPU:         4,
@@ -2454,6 +2566,83 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
+	"i8ge.12xlarge": {
+		InstanceType: "i8ge.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.18xlarge": {
+		InstanceType: "i8ge.18xlarge",
+		VCPU:         72,
+		MemoryMb:     589824,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.24xlarge": {
+		InstanceType: "i8ge.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.2xlarge": {
+		InstanceType: "i8ge.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.3xlarge": {
+		InstanceType: "i8ge.3xlarge",
+		VCPU:         12,
+		MemoryMb:     98304,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.48xlarge": {
+		InstanceType: "i8ge.48xlarge",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.6xlarge": {
+		InstanceType: "i8ge.6xlarge",
+		VCPU:         24,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.large": {
+		InstanceType: "i8ge.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.metal-24xl": {
+		InstanceType: "i8ge.metal-24xl",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.metal-48xl": {
+		InstanceType: "i8ge.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "arm64",
+	},
+	"i8ge.xlarge": {
+		InstanceType: "i8ge.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "arm64",
+	},
 	"im4gn.16xlarge": {
 		InstanceType: "im4gn.16xlarge",
 		VCPU:         64,
@@ -4113,6 +4302,146 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
+	"m8i-flex.12xlarge": {
+		InstanceType: "m8i-flex.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.16xlarge": {
+		InstanceType: "m8i-flex.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.2xlarge": {
+		InstanceType: "m8i-flex.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.4xlarge": {
+		InstanceType: "m8i-flex.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.8xlarge": {
+		InstanceType: "m8i-flex.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.large": {
+		InstanceType: "m8i-flex.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i-flex.xlarge": {
+		InstanceType: "m8i-flex.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.12xlarge": {
+		InstanceType: "m8i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     196608,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.16xlarge": {
+		InstanceType: "m8i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.24xlarge": {
+		InstanceType: "m8i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.2xlarge": {
+		InstanceType: "m8i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.32xlarge": {
+		InstanceType: "m8i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.48xlarge": {
+		InstanceType: "m8i.48xlarge",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.4xlarge": {
+		InstanceType: "m8i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.8xlarge": {
+		InstanceType: "m8i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.96xlarge": {
+		InstanceType: "m8i.96xlarge",
+		VCPU:         384,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.large": {
+		InstanceType: "m8i.large",
+		VCPU:         2,
+		MemoryMb:     8192,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.metal-48xl": {
+		InstanceType: "m8i.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.metal-96xl": {
+		InstanceType: "m8i.metal-96xl",
+		VCPU:         384,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"m8i.xlarge": {
+		InstanceType: "m8i.xlarge",
+		VCPU:         4,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"mac1.metal": {
 		InstanceType: "mac1.metal",
 		VCPU:         12,
@@ -4197,6 +4526,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          8,
 		Architecture: "amd64",
 	},
+	"p5.4xlarge": {
+		InstanceType: "p5.4xlarge",
+		VCPU:         16,
+		MemoryMb:     262144,
+		GPU:          1,
+		Architecture: "amd64",
+	},
 	"p5en.48xlarge": {
 		InstanceType: "p5en.48xlarge",
 		VCPU:         192,
@@ -4204,6 +4540,13 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          8,
 		Architecture: "amd64",
 	},
+	"p6-b200.48xlarge": {
+		InstanceType: "p6-b200.48xlarge",
+		VCPU:         192,
+		MemoryMb:     2097152,
+		GPU:          8,
+		Architecture: "amd64",
+	},
 	"r3.2xlarge": {
 		InstanceType: "r3.2xlarge",
 		VCPU:         8,
@@ -5716,6 +6059,146 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "arm64",
 	},
+	"r8i-flex.12xlarge": {
+		InstanceType: "r8i-flex.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.16xlarge": {
+		InstanceType: "r8i-flex.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.2xlarge": {
+		InstanceType: "r8i-flex.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.4xlarge": {
+		InstanceType: "r8i-flex.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.8xlarge": {
+		InstanceType: "r8i-flex.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.large": {
+		InstanceType: "r8i-flex.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i-flex.xlarge": {
+		InstanceType: "r8i-flex.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.12xlarge": {
+		InstanceType: "r8i.12xlarge",
+		VCPU:         48,
+		MemoryMb:     393216,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.16xlarge": {
+		InstanceType: "r8i.16xlarge",
+		VCPU:         64,
+		MemoryMb:     524288,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.24xlarge": {
+		InstanceType: "r8i.24xlarge",
+		VCPU:         96,
+		MemoryMb:     786432,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.2xlarge": {
+		InstanceType: "r8i.2xlarge",
+		VCPU:         8,
+		MemoryMb:     65536,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.32xlarge": {
+		InstanceType: "r8i.32xlarge",
+		VCPU:         128,
+		MemoryMb:     1048576,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.48xlarge": {
+		InstanceType: "r8i.48xlarge",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.4xlarge": {
+		InstanceType: "r8i.4xlarge",
+		VCPU:         16,
+		MemoryMb:     131072,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.8xlarge": {
+		InstanceType: "r8i.8xlarge",
+		VCPU:         32,
+		MemoryMb:     262144,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.96xlarge": {
+		InstanceType: "r8i.96xlarge",
+		VCPU:         384,
+		MemoryMb:     3145728,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.large": {
+		InstanceType: "r8i.large",
+		VCPU:         2,
+		MemoryMb:     16384,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.metal-48xl": {
+		InstanceType: "r8i.metal-48xl",
+		VCPU:         192,
+		MemoryMb:     1572864,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.metal-96xl": {
+		InstanceType: "r8i.metal-96xl",
+		VCPU:         384,
+		MemoryMb:     3145728,
+		GPU:          0,
+		Architecture: "amd64",
+	},
+	"r8i.xlarge": {
+		InstanceType: "r8i.xlarge",
+		VCPU:         4,
+		MemoryMb:     32768,
+		GPU:          0,
+		Architecture: "amd64",
+	},
 	"t1.micro": {
 		InstanceType: "t1.micro",
 		VCPU:         1,
@@ -5940,27 +6423,6 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"u-12tb1.112xlarge": {
-		InstanceType: "u-12tb1.112xlarge",
-		VCPU:         448,
-		MemoryMb:     12582912,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"u-18tb1.112xlarge": {
-		InstanceType: "u-18tb1.112xlarge",
-		VCPU:         448,
-		MemoryMb:     18874368,
-		GPU:          0,
-		Architecture: "amd64",
-	},
-	"u-24tb1.112xlarge": {
-		InstanceType: "u-24tb1.112xlarge",
-		VCPU:         448,
-		MemoryMb:     25165824,
-		GPU:          0,
-		Architecture: "amd64",
-	},
 	"u-3tb1.56xlarge": {
 		InstanceType: "u-3tb1.56xlarge",
 		VCPU:         224,
@@ -5982,13 +6444,6 @@ var InstanceTypes = map[string]*InstanceType{
 		GPU:          0,
 		Architecture: "amd64",
 	},
-	"u-9tb1.112xlarge": {
-		InstanceType: "u-9tb1.112xlarge",
-		VCPU:         448,
-		MemoryMb:     9437184,
-		GPU:          0,
-		Architecture: "amd64",
-	},
 	"u7i-12tb.224xlarge": {
 		InstanceType: "u7i-12tb.224xlarge",
 		VCPU:         896,