diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index 9e9c08ca1ed2..998123c9ec04 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -18,7 +18,7 @@ limitations under the License. package aws -// InstanceType is sepc of EC2 instance +// InstanceType is spec of EC2 instance type InstanceType struct { InstanceType string VCPU int64 @@ -223,7 +223,7 @@ var InstanceTypes = map[string]*InstanceType{ "c5d.12xlarge": { InstanceType: "c5d.12xlarge", VCPU: 48, - MemoryMb: 131072, + MemoryMb: 98304, GPU: 0, }, "c5d.18xlarge": { @@ -235,7 +235,7 @@ var InstanceTypes = map[string]*InstanceType{ "c5d.24xlarge": { InstanceType: "c5d.24xlarge", VCPU: 96, - MemoryMb: 262144, + MemoryMb: 196608, GPU: 0, }, "c5d.2xlarge": { @@ -265,7 +265,7 @@ var InstanceTypes = map[string]*InstanceType{ "c5d.metal": { InstanceType: "c5d.metal", VCPU: 96, - MemoryMb: 262144, + MemoryMb: 196608, GPU: 0, }, "c5d.xlarge": { @@ -436,6 +436,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 31232, GPU: 1, }, + "g4dn": { + InstanceType: "g4dn", + VCPU: 96, + MemoryMb: 0, + GPU: 8, + }, "g4dn.12xlarge": { InstanceType: "g4dn.12xlarge", VCPU: 48, @@ -466,6 +472,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 131072, GPU: 1, }, + "g4dn.metal": { + InstanceType: "g4dn.metal", + VCPU: 96, + MemoryMb: 393216, + GPU: 8, + }, "g4dn.xlarge": { InstanceType: "g4dn.xlarge", VCPU: 4, @@ -640,6 +652,30 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 32768, GPU: 0, }, + "inf1.24xlarge": { + InstanceType: "inf1.24xlarge", + VCPU: 96, + MemoryMb: 196608, + GPU: 0, + }, + "inf1.2xlarge": { + InstanceType: "inf1.2xlarge", + VCPU: 8, + MemoryMb: 16384, + GPU: 0, + }, + "inf1.6xlarge": { + InstanceType: "inf1.6xlarge", + VCPU: 24, + MemoryMb: 49152, + GPU: 0, + }, + "inf1.xlarge": { + InstanceType: "inf1.xlarge", + VCPU: 4, + MemoryMb: 8192, + GPU: 0, + }, "m1.large": { InstanceType: "m1.large", VCPU: 2, @@ -1090,6 +1126,54 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "m6g.12xlarge": { + InstanceType: "m6g.12xlarge", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, + "m6g.16xlarge": { + InstanceType: "m6g.16xlarge", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, + "m6g.2xlarge": { + InstanceType: "m6g.2xlarge", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "m6g.4xlarge": { + InstanceType: "m6g.4xlarge", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, + "m6g.8xlarge": { + InstanceType: "m6g.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, + "m6g.large": { + InstanceType: "m6g.large", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "m6g.medium": { + InstanceType: "m6g.medium", + VCPU: 1, + MemoryMb: 4096, + GPU: 0, + }, + "m6g.xlarge": { + InstanceType: "m6g.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "p2": { InstanceType: "p2", VCPU: 64, @@ -1099,7 +1183,7 @@ var InstanceTypes = map[string]*InstanceType{ "p2.16xlarge": { InstanceType: "p2.16xlarge", VCPU: 64, - MemoryMb: 786432, + MemoryMb: 749568, GPU: 16, }, "p2.8xlarge": { @@ -1117,7 +1201,7 @@ var InstanceTypes = map[string]*InstanceType{ "p3": { InstanceType: "p3", VCPU: 64, - MemoryMb: 499712, + MemoryMb: 0, GPU: 8, }, "p3.16xlarge": { @@ -1699,19 +1783,43 @@ var InstanceTypes = map[string]*InstanceType{ "u-12tb1": { InstanceType: "u-12tb1", VCPU: 448, - MemoryMb: 12582912, + MemoryMb: 0, + GPU: 0, + }, + "u-18tb1": { + InstanceType: "u-18tb1", + VCPU: 448, + MemoryMb: 0, + GPU: 0, + }, + "u-18tb1.metal": { + InstanceType: "u-18tb1.metal", + VCPU: 448, + MemoryMb: 18874368, + GPU: 0, + }, + "u-24tb1": { + InstanceType: "u-24tb1", + VCPU: 448, + MemoryMb: 0, + GPU: 0, + }, + "u-24tb1.metal": { + InstanceType: "u-24tb1.metal", + VCPU: 448, + MemoryMb: 25165824, GPU: 0, }, "u-6tb1": { InstanceType: "u-6tb1", VCPU: 448, - MemoryMb: 6291456, + MemoryMb: 0, GPU: 0, }, "u-9tb1": { InstanceType: "u-9tb1", VCPU: 448, - MemoryMb: 9437184, + MemoryMb: 0, GPU: 0, }, "x1": {