Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cluster-Autoscaler update AWS EC2 instance types with g5, m6 and r6 - 1.22 release branch #4485

Merged
merged 1 commit into from
Dec 13, 2021
Merged

Cluster-Autoscaler update AWS EC2 instance types with g5, m6 and r6 - 1.22 release branch #4485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster-autoscaler/cloudprovider/aws/aws_util.go
View file
Open in desktop
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"
ec2Arm64Processors = []string{"AWS Graviton Processor", "AWS Graviton2 Processor"}
)

Expand Down
280 changes: 280 additions & 0 deletions cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"c6i.metal": {
InstanceType: "c6i.metal",
VCPU: 128,
MemoryMb: 262144,
GPU: 0,
Architecture: "amd64",
},
"c6i.xlarge": {
InstanceType: "c6i.xlarge",
VCPU: 4,
Expand Down Expand Up @@ -1079,6 +1086,118 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 1,
Architecture: "amd64",
},
"g5": {
InstanceType: "g5",
VCPU: 192,
MemoryMb: 0,
GPU: 8,
Architecture: "amd64",
},
"g5.12xlarge": {
InstanceType: "g5.12xlarge",
VCPU: 48,
MemoryMb: 196608,
GPU: 4,
Architecture: "amd64",
},
"g5.16xlarge": {
InstanceType: "g5.16xlarge",
VCPU: 64,
MemoryMb: 262144,
GPU: 1,
Architecture: "amd64",
},
"g5.24xlarge": {
InstanceType: "g5.24xlarge",
VCPU: 96,
MemoryMb: 393216,
GPU: 4,
Architecture: "amd64",
},
"g5.2xlarge": {
InstanceType: "g5.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 1,
Architecture: "amd64",
},
"g5.48xlarge": {
InstanceType: "g5.48xlarge",
VCPU: 192,
MemoryMb: 786432,
GPU: 8,
Architecture: "amd64",
},
"g5.4xlarge": {
InstanceType: "g5.4xlarge",
VCPU: 16,
MemoryMb: 65536,
GPU: 1,
Architecture: "amd64",
},
"g5.8xlarge": {
InstanceType: "g5.8xlarge",
VCPU: 32,
MemoryMb: 131072,
GPU: 1,
Architecture: "amd64",
},
"g5.xlarge": {
InstanceType: "g5.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 1,
Architecture: "amd64",
},
"g5g": {
InstanceType: "g5g",
VCPU: 64,
MemoryMb: 0,
GPU: 2,
Architecture: "arm64",
},
"g5g.16xlarge": {
InstanceType: "g5g.16xlarge",
VCPU: 64,
MemoryMb: 131072,
GPU: 2,
Architecture: "arm64",
},
"g5g.2xlarge": {
InstanceType: "g5g.2xlarge",
VCPU: 8,
MemoryMb: 16384,
GPU: 1,
Architecture: "arm64",
},
"g5g.4xlarge": {
InstanceType: "g5g.4xlarge",
VCPU: 16,
MemoryMb: 32768,
GPU: 1,
Architecture: "arm64",
},
"g5g.8xlarge": {
InstanceType: "g5g.8xlarge",
VCPU: 32,
MemoryMb: 65536,
GPU: 1,
Architecture: "arm64",
},
"g5g.metal": {
InstanceType: "g5g.metal",
VCPU: 64,
MemoryMb: 131072,
GPU: 2,
Architecture: "arm64",
},
"g5g.xlarge": {
InstanceType: "g5g.xlarge",
VCPU: 4,
MemoryMb: 8192,
GPU: 1,
Architecture: "arm64",
},
"h1": {
InstanceType: "h1",
VCPU: 64,
Expand Down Expand Up @@ -1905,6 +2024,83 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"m6a": {
InstanceType: "m6a",
VCPU: 192,
MemoryMb: 0,
GPU: 0,
Architecture: "amd64",
},
"m6a.12xlarge": {
InstanceType: "m6a.12xlarge",
VCPU: 48,
MemoryMb: 196608,
GPU: 0,
Architecture: "amd64",
},
"m6a.16xlarge": {
InstanceType: "m6a.16xlarge",
VCPU: 64,
MemoryMb: 262144,
GPU: 0,
Architecture: "amd64",
},
"m6a.24xlarge": {
InstanceType: "m6a.24xlarge",
VCPU: 96,
MemoryMb: 393216,
GPU: 0,
Architecture: "amd64",
},
"m6a.2xlarge": {
InstanceType: "m6a.2xlarge",
VCPU: 8,
MemoryMb: 32768,
GPU: 0,
Architecture: "amd64",
},
"m6a.32xlarge": {
InstanceType: "m6a.32xlarge",
VCPU: 128,
MemoryMb: 524288,
GPU: 0,
Architecture: "amd64",
},
"m6a.48xlarge": {
InstanceType: "m6a.48xlarge",
VCPU: 192,
MemoryMb: 786432,
GPU: 0,
Architecture: "amd64",
},
"m6a.4xlarge": {
InstanceType: "m6a.4xlarge",
VCPU: 16,
MemoryMb: 65536,
GPU: 0,
Architecture: "amd64",
},
"m6a.8xlarge": {
InstanceType: "m6a.8xlarge",
VCPU: 32,
MemoryMb: 131072,
GPU: 0,
Architecture: "amd64",
},
"m6a.large": {
InstanceType: "m6a.large",
VCPU: 2,
MemoryMb: 8192,
GPU: 0,
Architecture: "amd64",
},
"m6a.xlarge": {
InstanceType: "m6a.xlarge",
VCPU: 4,
MemoryMb: 16384,
GPU: 0,
Architecture: "amd64",
},
"m6g": {
InstanceType: "m6g",
VCPU: 64,
Expand Down Expand Up @@ -2108,6 +2304,13 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "amd64",
},
"m6i.metal": {
InstanceType: "m6i.metal",
VCPU: 128,
MemoryMb: 524288,
GPU: 0,
Architecture: "amd64",
},
"m6i.xlarge": {
InstanceType: "m6i.xlarge",
VCPU: 4,
Expand Down Expand Up @@ -2906,6 +3109,83 @@ var InstanceTypes = map[string]*InstanceType{
GPU: 0,
Architecture: "arm64",
},
"r6i": {
InstanceType: "r6i",
VCPU: 128,
MemoryMb: 0,
GPU: 0,
Architecture: "amd64",
},
"r6i.12xlarge": {
InstanceType: "r6i.12xlarge",
VCPU: 48,
MemoryMb: 393216,
GPU: 0,
Architecture: "amd64",
},
"r6i.16xlarge": {
InstanceType: "r6i.16xlarge",
VCPU: 64,
MemoryMb: 524288,
GPU: 0,
Architecture: "amd64",
},
"r6i.24xlarge": {
InstanceType: "r6i.24xlarge",
VCPU: 96,
MemoryMb: 786432,
GPU: 0,
Architecture: "amd64",
},
"r6i.2xlarge": {
InstanceType: "r6i.2xlarge",
VCPU: 8,
MemoryMb: 65536,
GPU: 0,
Architecture: "amd64",
},
"r6i.32xlarge": {
InstanceType: "r6i.32xlarge",
VCPU: 128,
MemoryMb: 1048576,
GPU: 0,
Architecture: "amd64",
},
"r6i.4xlarge": {
InstanceType: "r6i.4xlarge",
VCPU: 16,
MemoryMb: 131072,
GPU: 0,
Architecture: "amd64",
},
"r6i.8xlarge": {
InstanceType: "r6i.8xlarge",
VCPU: 32,
MemoryMb: 262144,
GPU: 0,
Architecture: "amd64",
},
"r6i.large": {
InstanceType: "r6i.large",
VCPU: 2,
MemoryMb: 16384,
GPU: 0,
Architecture: "amd64",
},
"r6i.metal": {
InstanceType: "r6i.metal",
VCPU: 128,
MemoryMb: 1048576,
GPU: 0,
Architecture: "amd64",
},
"r6i.xlarge": {
InstanceType: "r6i.xlarge",
VCPU: 4,
MemoryMb: 32768,
GPU: 0,
Architecture: "amd64",
},
"t1.micro": {
InstanceType: "t1.micro",
VCPU: 1,
Expand Down