Skip to content

Commit

Permalink
Merge pull request #4382 from gjtempleton/CA-AWS-Instance-List-Update…
Browse files Browse the repository at this point in the history 
…-03-10-21-1.22

CA - AWS - Instance List Update 03-10-21 - 1.22 release branch
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Oct 18, 2021
2 parents c3ffe6a + 493d937 commit 7864660
Show file tree
Hide file tree
Showing 2 changed files with 225 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/aws/aws_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
ec2Arm64Processors = []string{"AWS Graviton Processor", "AWS Graviton2 Processor"}
)

Expand Down
224 changes: 224 additions & 0 deletions cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 4,
Architecture: "amd64",
},
"g4ad.2xlarge": {
InstanceType: "g4ad.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 1,
Architecture: "amd64",
},
"g4ad.4xlarge": {
InstanceType: "g4ad.4xlarge",
VCPU: 16,
Expand All @@ -925,6 +932,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 2,
Architecture: "amd64",
},
"g4ad.xlarge": {
InstanceType: "g4ad.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 1,
Architecture: "amd64",
},
"g4dn": {
InstanceType: "g4dn",
VCPU: 96,
Expand Down Expand Up @@ -1051,6 +1065,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"i2.large": {
InstanceType: "i2.large",
VCPU: 2,
MemoryMb: 15360,
GPU: 0,
Architecture: "amd64",
},
"i2.xlarge": {
InstanceType: "i2.xlarge",
VCPU: 4,
Expand Down Expand Up @@ -1940,6 +1961,76 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "arm64",
},
"m6i": {
InstanceType: "m6i",
VCPU: 128,
MemoryMb: 0,
GPU: 0,
Architecture: "amd64",
},
"m6i.12xlarge": {
InstanceType: "m6i.12xlarge",
VCPU: 48,
MemoryMb: 196608,
GPU: 0,
Architecture: "amd64",
},
"m6i.16xlarge": {
InstanceType: "m6i.16xlarge",
VCPU: 64,
MemoryMb: 262144,
GPU: 0,
Architecture: "amd64",
},
"m6i.24xlarge": {
InstanceType: "m6i.24xlarge",
VCPU: 96,
MemoryMb: 393216,
GPU: 0,
Architecture: "amd64",
},
"m6i.2xlarge": {
InstanceType: "m6i.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 0,
Architecture: "amd64",
},
"m6i.32xlarge": {
InstanceType: "m6i.32xlarge",
VCPU: 128,
MemoryMb: 524288,
GPU: 0,
Architecture: "amd64",
},
"m6i.4xlarge": {
InstanceType: "m6i.4xlarge",
VCPU: 16,
MemoryMb: 65536,
GPU: 0,
Architecture: "amd64",
},
"m6i.8xlarge": {
InstanceType: "m6i.8xlarge",
VCPU: 32,
MemoryMb: 131072,
GPU: 0,
Architecture: "amd64",
},
"m6i.large": {
InstanceType: "m6i.large",
VCPU: 2,
MemoryMb: 8192,
GPU: 0,
Architecture: "amd64",
},
"m6i.xlarge": {
InstanceType: "m6i.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 0,
Architecture: "amd64",
},
"mac1": {
InstanceType: "mac1",
VCPU: 12,
Expand Down Expand Up @@ -2787,6 +2878,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"t3": {
InstanceType: "t3",
VCPU: 8,
MemoryMb: 0,
GPU: 0,
Architecture: "amd64",
},
"t3.2xlarge": {
InstanceType: "t3.2xlarge",
VCPU: 8,
Expand Down Expand Up @@ -2941,6 +3039,13 @@ 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-12tb1.metal": {
InstanceType: "u-12tb1.metal",
VCPU: 448,
Expand Down Expand Up @@ -2983,6 +3088,20 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"u-6tb1.112xlarge": {
InstanceType: "u-6tb1.112xlarge",
VCPU: 448,
MemoryMb: 6291456,
GPU: 0,
Architecture: "amd64",
},
"u-6tb1.56xlarge": {
InstanceType: "u-6tb1.56xlarge",
VCPU: 224,
MemoryMb: 6291456,
GPU: 0,
Architecture: "amd64",
},
"u-6tb1.metal": {
InstanceType: "u-6tb1.metal",
VCPU: 448,
Expand All @@ -2997,13 +3116,48 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"u-9tb1.112xlarge": {
InstanceType: "u-9tb1.112xlarge",
VCPU: 448,
MemoryMb: 9437184,
GPU: 0,
Architecture: "amd64",
},
"u-9tb1.metal": {
InstanceType: "u-9tb1.metal",
VCPU: 448,
MemoryMb: 9437184,
GPU: 0,
Architecture: "amd64",
},
"vt1": {
InstanceType: "vt1",
VCPU: 96,
MemoryMb: 0,
GPU: 0,
Architecture: "amd64",
},
"vt1.24xlarge": {
InstanceType: "vt1.24xlarge",
VCPU: 96,
MemoryMb: 196608,
GPU: 0,
Architecture: "amd64",
},
"vt1.3xlarge": {
InstanceType: "vt1.3xlarge",
VCPU: 12,
MemoryMb: 24576,
GPU: 0,
Architecture: "amd64",
},
"vt1.6xlarge": {
InstanceType: "vt1.6xlarge",
VCPU: 24,
MemoryMb: 49152,
GPU: 0,
Architecture: "amd64",
},
"x1": {
InstanceType: "x1",
VCPU: 128,
Expand Down Expand Up @@ -3074,6 +3228,76 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"x2gd": {
InstanceType: "x2gd",
VCPU: 64,
MemoryMb: 0,
GPU: 0,
Architecture: "arm64",
},
"x2gd.12xlarge": {
InstanceType: "x2gd.12xlarge",
VCPU: 48,
MemoryMb: 786432,
GPU: 0,
Architecture: "arm64",
},
"x2gd.16xlarge": {
InstanceType: "x2gd.16xlarge",
VCPU: 64,
MemoryMb: 1048576,
GPU: 0,
Architecture: "arm64",
},
"x2gd.2xlarge": {
InstanceType: "x2gd.2xlarge",
VCPU: 8,
MemoryMb: 131072,
GPU: 0,
Architecture: "arm64",
},
"x2gd.4xlarge": {
InstanceType: "x2gd.4xlarge",
VCPU: 16,
MemoryMb: 262144,
GPU: 0,
Architecture: "arm64",
},
"x2gd.8xlarge": {
InstanceType: "x2gd.8xlarge",
VCPU: 32,
MemoryMb: 524288,
GPU: 0,
Architecture: "arm64",
},
"x2gd.large": {
InstanceType: "x2gd.large",
VCPU: 2,
MemoryMb: 32768,
GPU: 0,
Architecture: "arm64",
},
"x2gd.medium": {
InstanceType: "x2gd.medium",
VCPU: 1,
MemoryMb: 16384,
GPU: 0,
Architecture: "arm64",
},
"x2gd.metal": {
InstanceType: "x2gd.metal",
VCPU: 64,
MemoryMb: 1048576,
GPU: 0,
Architecture: "arm64",
},
"x2gd.xlarge": {
InstanceType: "x2gd.xlarge",
VCPU: 4,
MemoryMb: 65536,
GPU: 0,
Architecture: "arm64",
},
"z1d": {
InstanceType: "z1d",
VCPU: 48,
Expand Down

0 comments on commit 7864660

Please sign in to comment.