Skip to content

Commit

Permalink
Merge pull request #4484 from sturman/CA-EC2-AWS-Instance-List-Update…
Browse files Browse the repository at this point in the history 
…-29-11-21-1.21

Cluster-Autoscaler update AWS EC2 instance types with g5, m6 and r6 - 1.21 release branch
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Dec 13, 2021
2 parents 5547629 + 43641f8 commit df4aaf6
Show file tree
Hide file tree
Showing 2 changed files with 241 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 = "2021-10-29"
staticListLastUpdateTime = "2021-11-29"
)

type response struct {
Expand Down
240 changes: 240 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 @@ -652,6 +652,12 @@ var InstanceTypes = map[string]*InstanceType{
MemoryMb: 4096,
GPU: 0,
},
"c6i.metal": {
InstanceType: "c6i.metal",
VCPU: 128,
MemoryMb: 262144,
GPU: 0,
},
"c6i.xlarge": {
InstanceType: "c6i.xlarge",
VCPU: 4,
Expand Down Expand Up @@ -928,6 +934,102 @@ var InstanceTypes = map[string]*InstanceType{
MemoryMb: 16384,
GPU: 1,
},
"g5": {
InstanceType: "g5",
VCPU: 192,
MemoryMb: 0,
GPU: 8,
},
"g5.12xlarge": {
InstanceType: "g5.12xlarge",
VCPU: 48,
MemoryMb: 196608,
GPU: 4,
},
"g5.16xlarge": {
InstanceType: "g5.16xlarge",
VCPU: 64,
MemoryMb: 262144,
GPU: 1,
},
"g5.24xlarge": {
InstanceType: "g5.24xlarge",
VCPU: 96,
MemoryMb: 393216,
GPU: 4,
},
"g5.2xlarge": {
InstanceType: "g5.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 1,
},
"g5.48xlarge": {
InstanceType: "g5.48xlarge",
VCPU: 192,
MemoryMb: 786432,
GPU: 8,
},
"g5.4xlarge": {
InstanceType: "g5.4xlarge",
VCPU: 16,
MemoryMb: 65536,
GPU: 1,
},
"g5.8xlarge": {
InstanceType: "g5.8xlarge",
VCPU: 32,
MemoryMb: 131072,
GPU: 1,
},
"g5.xlarge": {
InstanceType: "g5.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 1,
},
"g5g": {
InstanceType: "g5g",
VCPU: 64,
MemoryMb: 0,
GPU: 2,
},
"g5g.16xlarge": {
InstanceType: "g5g.16xlarge",
VCPU: 64,
MemoryMb: 131072,
GPU: 2,
},
"g5g.2xlarge": {
InstanceType: "g5g.2xlarge",
VCPU: 8,
MemoryMb: 16384,
GPU: 1,
},
"g5g.4xlarge": {
InstanceType: "g5g.4xlarge",
VCPU: 16,
MemoryMb: 32768,
GPU: 1,
},
"g5g.8xlarge": {
InstanceType: "g5g.8xlarge",
VCPU: 32,
MemoryMb: 65536,
GPU: 1,
},
"g5g.metal": {
InstanceType: "g5g.metal",
VCPU: 64,
MemoryMb: 131072,
GPU: 2,
},
"g5g.xlarge": {
InstanceType: "g5g.xlarge",
VCPU: 4,
MemoryMb: 8192,
GPU: 1,
},
"h1": {
InstanceType: "h1",
VCPU: 64,
Expand Down Expand Up @@ -1636,6 +1738,72 @@ var InstanceTypes = map[string]*InstanceType{
MemoryMb: 16384,
GPU: 0,
},
"m6a": {
InstanceType: "m6a",
VCPU: 192,
MemoryMb: 0,
GPU: 0,
},
"m6a.12xlarge": {
InstanceType: "m6a.12xlarge",
VCPU: 48,
MemoryMb: 196608,
GPU: 0,
},
"m6a.16xlarge": {
InstanceType: "m6a.16xlarge",
VCPU: 64,
MemoryMb: 262144,
GPU: 0,
},
"m6a.24xlarge": {
InstanceType: "m6a.24xlarge",
VCPU: 96,
MemoryMb: 393216,
GPU: 0,
},
"m6a.2xlarge": {
InstanceType: "m6a.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 0,
},
"m6a.32xlarge": {
InstanceType: "m6a.32xlarge",
VCPU: 128,
MemoryMb: 524288,
GPU: 0,
},
"m6a.48xlarge": {
InstanceType: "m6a.48xlarge",
VCPU: 192,
MemoryMb: 786432,
GPU: 0,
},
"m6a.4xlarge": {
InstanceType: "m6a.4xlarge",
VCPU: 16,
MemoryMb: 65536,
GPU: 0,
},
"m6a.8xlarge": {
InstanceType: "m6a.8xlarge",
VCPU: 32,
MemoryMb: 131072,
GPU: 0,
},
"m6a.large": {
InstanceType: "m6a.large",
VCPU: 2,
MemoryMb: 8192,
GPU: 0,
},
"m6a.xlarge": {
InstanceType: "m6a.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 0,
},
"m6g": {
InstanceType: "m6g",
VCPU: 64,
Expand Down Expand Up @@ -1810,6 +1978,12 @@ var InstanceTypes = map[string]*InstanceType{
MemoryMb: 8192,
GPU: 0,
},
"m6i.metal": {
InstanceType: "m6i.metal",
VCPU: 128,
MemoryMb: 524288,
GPU: 0,
},
"m6i.xlarge": {
InstanceType: "m6i.xlarge",
VCPU: 4,
Expand Down Expand Up @@ -2494,6 +2668,72 @@ var InstanceTypes = map[string]*InstanceType{
MemoryMb: 32768,
GPU: 0,
},
"r6i": {
InstanceType: "r6i",
VCPU: 128,
MemoryMb: 0,
GPU: 0,
},
"r6i.12xlarge": {
InstanceType: "r6i.12xlarge",
VCPU: 48,
MemoryMb: 393216,
GPU: 0,
},
"r6i.16xlarge": {
InstanceType: "r6i.16xlarge",
VCPU: 64,
MemoryMb: 524288,
GPU: 0,
},
"r6i.24xlarge": {
InstanceType: "r6i.24xlarge",
VCPU: 96,
MemoryMb: 786432,
GPU: 0,
},
"r6i.2xlarge": {
InstanceType: "r6i.2xlarge",
VCPU: 8,
MemoryMb: 65536,
GPU: 0,
},
"r6i.32xlarge": {
InstanceType: "r6i.32xlarge",
VCPU: 128,
MemoryMb: 1048576,
GPU: 0,
},
"r6i.4xlarge": {
InstanceType: "r6i.4xlarge",
VCPU: 16,
MemoryMb: 131072,
GPU: 0,
},
"r6i.8xlarge": {
InstanceType: "r6i.8xlarge",
VCPU: 32,
MemoryMb: 262144,
GPU: 0,
},
"r6i.large": {
InstanceType: "r6i.large",
VCPU: 2,
MemoryMb: 16384,
GPU: 0,
},
"r6i.metal": {
InstanceType: "r6i.metal",
VCPU: 128,
MemoryMb: 1048576,
GPU: 0,
},
"r6i.xlarge": {
InstanceType: "r6i.xlarge",
VCPU: 4,
MemoryMb: 32768,
GPU: 0,
},
"t1.micro": {
InstanceType: "t1.micro",
VCPU: 1,
Expand Down

0 comments on commit df4aaf6

Please sign in to comment.