diff --git a/cluster-autoscaler/cloudprovider/aws/aws_util.go b/cluster-autoscaler/cloudprovider/aws/aws_util.go index 568de5568498..58e3c3ba7d45 100644 --- a/cluster-autoscaler/cloudprovider/aws/aws_util.go +++ b/cluster-autoscaler/cloudprovider/aws/aws_util.go @@ -39,7 +39,7 @@ var ( ec2MetaDataServiceUrl = "http://169.254.169.254" ec2PricingServiceUrlTemplate = "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonEC2/current/%s/index.json" ec2PricingServiceUrlTemplateCN = "https://pricing.cn-north-1.amazonaws.com.cn/offers/v1.0/cn/AmazonEC2/current/%s/index.json" - staticListLastUpdateTime = "2020-12-07" + staticListLastUpdateTime = "2021-10-03" ) type response struct { diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index fa7df49b185c..d8013227c26f 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -538,6 +538,66 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 8192, GPU: 0, }, + "c6gn": { + InstanceType: "c6gn", + VCPU: 64, + MemoryMb: 0, + GPU: 0, + }, + "c6gn.12xlarge": { + InstanceType: "c6gn.12xlarge", + VCPU: 48, + MemoryMb: 98304, + GPU: 0, + }, + "c6gn.16xlarge": { + InstanceType: "c6gn.16xlarge", + VCPU: 64, + MemoryMb: 131072, + GPU: 0, + }, + "c6gn.2xlarge": { + InstanceType: "c6gn.2xlarge", + VCPU: 8, + MemoryMb: 16384, + GPU: 0, + }, + "c6gn.4xlarge": { + InstanceType: "c6gn.4xlarge", + VCPU: 16, + MemoryMb: 32768, + GPU: 0, + }, + "c6gn.8xlarge": { + InstanceType: "c6gn.8xlarge", + VCPU: 32, + MemoryMb: 65536, + GPU: 0, + }, + "c6gn.large": { + InstanceType: "c6gn.large", + VCPU: 2, + MemoryMb: 4096, + GPU: 0, + }, + "c6gn.medium": { + InstanceType: "c6gn.medium", + VCPU: 1, + MemoryMb: 2048, + GPU: 0, + }, + "c6gn.metal": { + InstanceType: "c6gn.metal", + VCPU: 64, + MemoryMb: 131072, + GPU: 0, + }, + "c6gn.xlarge": { + InstanceType: "c6gn.xlarge", + VCPU: 4, + MemoryMb: 8192, + GPU: 0, + }, "cc2.8xlarge": { InstanceType: "cc2.8xlarge", VCPU: 32, @@ -712,6 +772,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 31232, GPU: 1, }, + "g4ad": { + InstanceType: "g4ad", + VCPU: 192, + MemoryMb: 0, + GPU: 2, + }, + "g4ad.16xlarge": { + InstanceType: "g4ad.16xlarge", + VCPU: 64, + MemoryMb: 262144, + GPU: 4, + }, + "g4ad.2xlarge": { + InstanceType: "g4ad.2xlarge", + VCPU: 8, + MemoryMb: 32768, + GPU: 1, + }, + "g4ad.4xlarge": { + InstanceType: "g4ad.4xlarge", + VCPU: 16, + MemoryMb: 65536, + GPU: 1, + }, + "g4ad.8xlarge": { + InstanceType: "g4ad.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 2, + }, + "g4ad.xlarge": { + InstanceType: "g4ad.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 1, + }, "g4dn": { InstanceType: "g4dn", VCPU: 96, @@ -820,6 +916,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 249856, GPU: 0, }, + "i2.large": { + InstanceType: "i2.large", + VCPU: 2, + MemoryMb: 15360, + GPU: 0, + }, "i2.xlarge": { InstanceType: "i2.xlarge", VCPU: 4, @@ -1582,6 +1684,66 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "m6i": { + InstanceType: "m6i", + VCPU: 128, + MemoryMb: 0, + GPU: 0, + }, + "m6i.12xlarge": { + InstanceType: "m6i.12xlarge", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + }, + "m6i.16xlarge": { + InstanceType: "m6i.16xlarge", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + }, + "m6i.24xlarge": { + InstanceType: "m6i.24xlarge", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + }, + "m6i.2xlarge": { + InstanceType: "m6i.2xlarge", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + }, + "m6i.32xlarge": { + InstanceType: "m6i.32xlarge", + VCPU: 128, + MemoryMb: 524288, + GPU: 0, + }, + "m6i.4xlarge": { + InstanceType: "m6i.4xlarge", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + }, + "m6i.8xlarge": { + InstanceType: "m6i.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + }, + "m6i.large": { + InstanceType: "m6i.large", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + }, + "m6i.xlarge": { + InstanceType: "m6i.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + }, "mac1": { InstanceType: "mac1", VCPU: 12, @@ -1654,6 +1816,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 786432, GPU: 8, }, + "p4d": { + InstanceType: "p4d", + VCPU: 96, + MemoryMb: 0, + GPU: 8, + }, "p4d.24xlarge": { InstanceType: "p4d.24xlarge", VCPU: 96, @@ -2302,6 +2470,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 16384, GPU: 0, }, + "t3": { + InstanceType: "t3", + VCPU: 8, + MemoryMb: 0, + GPU: 0, + }, "t3.2xlarge": { InstanceType: "t3.2xlarge", VCPU: 8, @@ -2434,6 +2608,12 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 0, GPU: 0, }, + "u-12tb1.112xlarge": { + InstanceType: "u-12tb1.112xlarge", + VCPU: 448, + MemoryMb: 12582912, + GPU: 0, + }, "u-12tb1.metal": { InstanceType: "u-12tb1.metal", VCPU: 448, @@ -2470,6 +2650,18 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 0, GPU: 0, }, + "u-6tb1.112xlarge": { + InstanceType: "u-6tb1.112xlarge", + VCPU: 448, + MemoryMb: 6291456, + GPU: 0, + }, + "u-6tb1.56xlarge": { + InstanceType: "u-6tb1.56xlarge", + VCPU: 224, + MemoryMb: 6291456, + GPU: 0, + }, "u-6tb1.metal": { InstanceType: "u-6tb1.metal", VCPU: 448, @@ -2482,12 +2674,42 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 0, GPU: 0, }, + "u-9tb1.112xlarge": { + InstanceType: "u-9tb1.112xlarge", + VCPU: 448, + MemoryMb: 9437184, + GPU: 0, + }, "u-9tb1.metal": { InstanceType: "u-9tb1.metal", VCPU: 448, MemoryMb: 9437184, GPU: 0, }, + "vt1": { + InstanceType: "vt1", + VCPU: 96, + MemoryMb: 0, + GPU: 0, + }, + "vt1.24xlarge": { + InstanceType: "vt1.24xlarge", + VCPU: 96, + MemoryMb: 196608, + GPU: 0, + }, + "vt1.3xlarge": { + InstanceType: "vt1.3xlarge", + VCPU: 12, + MemoryMb: 24576, + GPU: 0, + }, + "vt1.6xlarge": { + InstanceType: "vt1.6xlarge", + VCPU: 24, + MemoryMb: 49152, + GPU: 0, + }, "x1": { InstanceType: "x1", VCPU: 128, @@ -2548,6 +2770,66 @@ var InstanceTypes = map[string]*InstanceType{ MemoryMb: 124928, GPU: 0, }, + "x2gd": { + InstanceType: "x2gd", + VCPU: 64, + MemoryMb: 0, + GPU: 0, + }, + "x2gd.12xlarge": { + InstanceType: "x2gd.12xlarge", + VCPU: 48, + MemoryMb: 786432, + GPU: 0, + }, + "x2gd.16xlarge": { + InstanceType: "x2gd.16xlarge", + VCPU: 64, + MemoryMb: 1048576, + GPU: 0, + }, + "x2gd.2xlarge": { + InstanceType: "x2gd.2xlarge", + VCPU: 8, + MemoryMb: 131072, + GPU: 0, + }, + "x2gd.4xlarge": { + InstanceType: "x2gd.4xlarge", + VCPU: 16, + MemoryMb: 262144, + GPU: 0, + }, + "x2gd.8xlarge": { + InstanceType: "x2gd.8xlarge", + VCPU: 32, + MemoryMb: 524288, + GPU: 0, + }, + "x2gd.large": { + InstanceType: "x2gd.large", + VCPU: 2, + MemoryMb: 32768, + GPU: 0, + }, + "x2gd.medium": { + InstanceType: "x2gd.medium", + VCPU: 1, + MemoryMb: 16384, + GPU: 0, + }, + "x2gd.metal": { + InstanceType: "x2gd.metal", + VCPU: 64, + MemoryMb: 1048576, + GPU: 0, + }, + "x2gd.xlarge": { + InstanceType: "x2gd.xlarge", + VCPU: 4, + MemoryMb: 65536, + GPU: 0, + }, "z1d": { InstanceType: "z1d", VCPU: 48,