diff --git a/cluster-autoscaler/cloudprovider/aws/README.md b/cluster-autoscaler/cloudprovider/aws/README.md index 8ac9bc4fe3bc337e0fcd2a9bd4584344a3f9a0a7..45560531c6afaae55374a663f17be52b1984bedf 100644 --- a/cluster-autoscaler/cloudprovider/aws/README.md +++ b/cluster-autoscaler/cloudprovider/aws/README.md @@ -421,8 +421,7 @@ specify the command-line flag `--aws-use-static-instance-list=true` to switch the CA back to its original use of a statically defined set. To refresh static list, please run `go run ec2_instance_types/gen.go` under -`cluster-autoscaler/cloudprovider/aws/` and update `staticListLastUpdateTime` in -`aws_util.go` +`cluster-autoscaler/cloudprovider/aws/`. ## Using the AWS SDK vendored in the AWS cloudprovider diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index 7ca8dd51f8af92d118bd1224bbc4b6cedc316a5c..6e446e2f48f635cc5b61b4de75683486c0613f94 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -28,7 +28,7 @@ type InstanceType struct { } // StaticListLastUpdateTime is a string declaring the last time the static list was updated. -var StaticListLastUpdateTime = "2024-10-02" +var StaticListLastUpdateTime = "2025-05-27" // InstanceTypes is a map of ec2 resources var InstanceTypes = map[string]*InstanceType{ @@ -1187,6 +1187,20 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, + "c7i-flex.12xlarge": { + InstanceType: "c7i-flex.12xlarge", + VCPU: 48, + MemoryMb: 98304, + GPU: 0, + Architecture: "amd64", + }, + "c7i-flex.16xlarge": { + InstanceType: "c7i-flex.16xlarge", + VCPU: 64, + MemoryMb: 131072, + GPU: 0, + Architecture: "amd64", + }, "c7i-flex.2xlarge": { InstanceType: "c7i-flex.2xlarge", VCPU: 8, @@ -1383,6 +1397,90 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, + "c8gd.12xlarge": { + InstanceType: "c8gd.12xlarge", + VCPU: 48, + MemoryMb: 98304, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.16xlarge": { + InstanceType: "c8gd.16xlarge", + VCPU: 64, + MemoryMb: 131072, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.24xlarge": { + InstanceType: "c8gd.24xlarge", + VCPU: 96, + MemoryMb: 196608, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.2xlarge": { + InstanceType: "c8gd.2xlarge", + VCPU: 8, + MemoryMb: 16384, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.48xlarge": { + InstanceType: "c8gd.48xlarge", + VCPU: 192, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.4xlarge": { + InstanceType: "c8gd.4xlarge", + VCPU: 16, + MemoryMb: 32768, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.8xlarge": { + InstanceType: "c8gd.8xlarge", + VCPU: 32, + MemoryMb: 65536, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.large": { + InstanceType: "c8gd.large", + VCPU: 2, + MemoryMb: 4096, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.medium": { + InstanceType: "c8gd.medium", + VCPU: 1, + MemoryMb: 2048, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.metal-24xl": { + InstanceType: "c8gd.metal-24xl", + VCPU: 96, + MemoryMb: 196608, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.metal-48xl": { + InstanceType: "c8gd.metal-48xl", + VCPU: 192, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "c8gd.xlarge": { + InstanceType: "c8gd.xlarge", + VCPU: 4, + MemoryMb: 8192, + GPU: 0, + Architecture: "arm64", + }, "d2.2xlarge": { InstanceType: "d2.2xlarge", VCPU: 8, @@ -1509,32 +1607,25 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "g3.16xlarge": { - InstanceType: "g3.16xlarge", - VCPU: 64, - MemoryMb: 499712, - GPU: 4, - Architecture: "amd64", - }, - "g3.4xlarge": { - InstanceType: "g3.4xlarge", - VCPU: 16, - MemoryMb: 124928, - GPU: 1, + "f2.12xlarge": { + InstanceType: "f2.12xlarge", + VCPU: 48, + MemoryMb: 524288, + GPU: 0, Architecture: "amd64", }, - "g3.8xlarge": { - InstanceType: "g3.8xlarge", - VCPU: 32, - MemoryMb: 249856, - GPU: 2, + "f2.48xlarge": { + InstanceType: "f2.48xlarge", + VCPU: 192, + MemoryMb: 2097152, + GPU: 0, Architecture: "amd64", }, - "g3s.xlarge": { - InstanceType: "g3s.xlarge", - VCPU: 4, - MemoryMb: 31232, - GPU: 1, + "f2.6xlarge": { + InstanceType: "f2.6xlarge", + VCPU: 24, + MemoryMb: 262144, + GPU: 0, Architecture: "amd64", }, "g4ad.16xlarge": { @@ -2139,6 +2230,230 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, + "i7i.12xlarge": { + InstanceType: "i7i.12xlarge", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + Architecture: "amd64", + }, + "i7i.16xlarge": { + InstanceType: "i7i.16xlarge", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + Architecture: "amd64", + }, + "i7i.24xlarge": { + InstanceType: "i7i.24xlarge", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "amd64", + }, + "i7i.2xlarge": { + InstanceType: "i7i.2xlarge", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + Architecture: "amd64", + }, + "i7i.48xlarge": { + InstanceType: "i7i.48xlarge", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "amd64", + }, + "i7i.4xlarge": { + InstanceType: "i7i.4xlarge", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + Architecture: "amd64", + }, + "i7i.8xlarge": { + InstanceType: "i7i.8xlarge", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + Architecture: "amd64", + }, + "i7i.large": { + InstanceType: "i7i.large", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + Architecture: "amd64", + }, + "i7i.metal-24xl": { + InstanceType: "i7i.metal-24xl", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "amd64", + }, + "i7i.metal-48xl": { + InstanceType: "i7i.metal-48xl", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "amd64", + }, + "i7i.xlarge": { + InstanceType: "i7i.xlarge", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.12xlarge": { + InstanceType: "i7ie.12xlarge", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.18xlarge": { + InstanceType: "i7ie.18xlarge", + VCPU: 72, + MemoryMb: 589824, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.24xlarge": { + InstanceType: "i7ie.24xlarge", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.2xlarge": { + InstanceType: "i7ie.2xlarge", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.3xlarge": { + InstanceType: "i7ie.3xlarge", + VCPU: 12, + MemoryMb: 98304, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.48xlarge": { + InstanceType: "i7ie.48xlarge", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.6xlarge": { + InstanceType: "i7ie.6xlarge", + VCPU: 24, + MemoryMb: 196608, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.large": { + InstanceType: "i7ie.large", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.metal-24xl": { + InstanceType: "i7ie.metal-24xl", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.metal-48xl": { + InstanceType: "i7ie.metal-48xl", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "amd64", + }, + "i7ie.xlarge": { + InstanceType: "i7ie.xlarge", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + Architecture: "amd64", + }, + "i8g.12xlarge": { + InstanceType: "i8g.12xlarge", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "i8g.16xlarge": { + InstanceType: "i8g.16xlarge", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + Architecture: "arm64", + }, + "i8g.24xlarge": { + InstanceType: "i8g.24xlarge", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "i8g.2xlarge": { + InstanceType: "i8g.2xlarge", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + Architecture: "arm64", + }, + "i8g.48xlarge": { + InstanceType: "i8g.48xlarge", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "arm64", + }, + "i8g.4xlarge": { + InstanceType: "i8g.4xlarge", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + Architecture: "arm64", + }, + "i8g.8xlarge": { + InstanceType: "i8g.8xlarge", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + Architecture: "arm64", + }, + "i8g.large": { + InstanceType: "i8g.large", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + Architecture: "arm64", + }, + "i8g.metal-24xl": { + InstanceType: "i8g.metal-24xl", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "i8g.xlarge": { + InstanceType: "i8g.xlarge", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + Architecture: "arm64", + }, "im4gn.16xlarge": { InstanceType: "im4gn.16xlarge", VCPU: 64, @@ -3504,6 +3819,20 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, + "m7i-flex.12xlarge": { + InstanceType: "m7i-flex.12xlarge", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + Architecture: "amd64", + }, + "m7i-flex.16xlarge": { + InstanceType: "m7i-flex.16xlarge", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + Architecture: "amd64", + }, "m7i-flex.2xlarge": { InstanceType: "m7i-flex.2xlarge", VCPU: 8, @@ -3700,6 +4029,90 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, + "m8gd.12xlarge": { + InstanceType: "m8gd.12xlarge", + VCPU: 48, + MemoryMb: 196608, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.16xlarge": { + InstanceType: "m8gd.16xlarge", + VCPU: 64, + MemoryMb: 262144, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.24xlarge": { + InstanceType: "m8gd.24xlarge", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.2xlarge": { + InstanceType: "m8gd.2xlarge", + VCPU: 8, + MemoryMb: 32768, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.48xlarge": { + InstanceType: "m8gd.48xlarge", + VCPU: 192, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.4xlarge": { + InstanceType: "m8gd.4xlarge", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.8xlarge": { + InstanceType: "m8gd.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.large": { + InstanceType: "m8gd.large", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.medium": { + InstanceType: "m8gd.medium", + VCPU: 1, + MemoryMb: 4096, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.metal-24xl": { + InstanceType: "m8gd.metal-24xl", + VCPU: 96, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.metal-48xl": { + InstanceType: "m8gd.metal-48xl", + VCPU: 192, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "m8gd.xlarge": { + InstanceType: "m8gd.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + Architecture: "arm64", + }, "mac1.metal": { InstanceType: "mac1.metal", VCPU: 12, @@ -3735,27 +4148,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "p2.16xlarge": { - InstanceType: "p2.16xlarge", - VCPU: 64, - MemoryMb: 749568, - GPU: 16, - Architecture: "amd64", - }, - "p2.8xlarge": { - InstanceType: "p2.8xlarge", - VCPU: 32, - MemoryMb: 499712, - GPU: 8, - Architecture: "amd64", - }, - "p2.xlarge": { - InstanceType: "p2.xlarge", - VCPU: 4, - MemoryMb: 62464, - GPU: 1, - Architecture: "amd64", - }, "p3.16xlarge": { InstanceType: "p3.16xlarge", VCPU: 64, @@ -3805,6 +4197,13 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 8, Architecture: "amd64", }, + "p5en.48xlarge": { + InstanceType: "p5en.48xlarge", + VCPU: 192, + MemoryMb: 2097152, + GPU: 8, + Architecture: "amd64", + }, "r3.2xlarge": { InstanceType: "r3.2xlarge", VCPU: 8, @@ -5233,6 +5632,90 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, + "r8gd.12xlarge": { + InstanceType: "r8gd.12xlarge", + VCPU: 48, + MemoryMb: 393216, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.16xlarge": { + InstanceType: "r8gd.16xlarge", + VCPU: 64, + MemoryMb: 524288, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.24xlarge": { + InstanceType: "r8gd.24xlarge", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.2xlarge": { + InstanceType: "r8gd.2xlarge", + VCPU: 8, + MemoryMb: 65536, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.48xlarge": { + InstanceType: "r8gd.48xlarge", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.4xlarge": { + InstanceType: "r8gd.4xlarge", + VCPU: 16, + MemoryMb: 131072, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.8xlarge": { + InstanceType: "r8gd.8xlarge", + VCPU: 32, + MemoryMb: 262144, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.large": { + InstanceType: "r8gd.large", + VCPU: 2, + MemoryMb: 16384, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.medium": { + InstanceType: "r8gd.medium", + VCPU: 1, + MemoryMb: 8192, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.metal-24xl": { + InstanceType: "r8gd.metal-24xl", + VCPU: 96, + MemoryMb: 786432, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.metal-48xl": { + InstanceType: "r8gd.metal-48xl", + VCPU: 192, + MemoryMb: 1572864, + GPU: 0, + Architecture: "arm64", + }, + "r8gd.xlarge": { + InstanceType: "r8gd.xlarge", + VCPU: 4, + MemoryMb: 32768, + GPU: 0, + Architecture: "arm64", + }, "t1.micro": { InstanceType: "t1.micro", VCPU: 1, @@ -5513,6 +5996,20 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, + "u7i-6tb.112xlarge": { + InstanceType: "u7i-6tb.112xlarge", + VCPU: 448, + MemoryMb: 6291456, + GPU: 0, + Architecture: "amd64", + }, + "u7i-8tb.112xlarge": { + InstanceType: "u7i-8tb.112xlarge", + VCPU: 448, + MemoryMb: 8388608, + GPU: 0, + Architecture: "amd64", + }, "u7in-16tb.224xlarge": { InstanceType: "u7in-16tb.224xlarge", VCPU: 896,