From 1b459edff50558e1927cab6c8aa594e786342dc8 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Fri, 13 Jan 2023 09:58:23 -0600 Subject: [PATCH] env/aws: update ec2 cpu info data (#15770) --- .changelog/15770.txt | 3 ++ client/fingerprint/env_aws_cpu.go | 50 +++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 .changelog/15770.txt diff --git a/.changelog/15770.txt b/.changelog/15770.txt new file mode 100644 index 000000000000..b60ae5b7a026 --- /dev/null +++ b/.changelog/15770.txt @@ -0,0 +1,3 @@ +```release-note:improvement +env/ec2: update cpu metadata +``` diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go index 5678a1105f87..97963cb5f26e 100644 --- a/client/fingerprint/env_aws_cpu.go +++ b/client/fingerprint/env_aws_cpu.go @@ -156,6 +156,15 @@ var instanceTypeCPU = map[string]CPU{ "c6id.large": newCPU(2, 3.5), "c6id.metal": newCPU(128, 3.5), "c6id.xlarge": newCPU(4, 3.5), + "c6in.12xlarge": newCPU(48, 3.5), + "c6in.16xlarge": newCPU(64, 3.5), + "c6in.24xlarge": newCPU(96, 3.5), + "c6in.2xlarge": newCPU(8, 3.5), + "c6in.32xlarge": newCPU(128, 3.5), + "c6in.4xlarge": newCPU(16, 3.5), + "c6in.8xlarge": newCPU(32, 3.5), + "c6in.large": newCPU(2, 3.5), + "c6in.xlarge": newCPU(4, 3.5), "c7g.12xlarge": newCPU(48, 2.6), "c7g.16xlarge": newCPU(64, 2.6), "c7g.2xlarge": newCPU(8, 2.6), @@ -220,6 +229,7 @@ var instanceTypeCPU = map[string]CPU{ "h1.4xlarge": newCPU(16, 2.3), "h1.8xlarge": newCPU(32, 2.3), "hpc6a.48xlarge": newCPU(96, 3.6), + "hpc6id.32xlarge": newCPU(64, 3.5), "i2.2xlarge": newCPU(8, 2.5), "i2.4xlarge": newCPU(16, 2.5), "i2.8xlarge": newCPU(32, 2.5), @@ -381,6 +391,24 @@ var instanceTypeCPU = map[string]CPU{ "m6id.large": newCPU(2, 3.5), "m6id.metal": newCPU(128, 3.5), "m6id.xlarge": newCPU(4, 3.5), + "m6idn.12xlarge": newCPU(48, 3.5), + "m6idn.16xlarge": newCPU(64, 3.5), + "m6idn.24xlarge": newCPU(96, 3.5), + "m6idn.2xlarge": newCPU(8, 3.5), + "m6idn.32xlarge": newCPU(128, 3.5), + "m6idn.4xlarge": newCPU(16, 3.5), + "m6idn.8xlarge": newCPU(32, 3.5), + "m6idn.large": newCPU(2, 3.5), + "m6idn.xlarge": newCPU(4, 3.5), + "m6in.12xlarge": newCPU(48, 3.5), + "m6in.16xlarge": newCPU(64, 3.5), + "m6in.24xlarge": newCPU(96, 3.5), + "m6in.2xlarge": newCPU(8, 3.5), + "m6in.32xlarge": newCPU(128, 3.5), + "m6in.4xlarge": newCPU(16, 3.5), + "m6in.8xlarge": newCPU(32, 3.5), + "m6in.large": newCPU(2, 3.5), + "m6in.xlarge": newCPU(4, 3.5), "mac1.metal": newCPU(12, 3.2), "mac2.metal": newCPU(8, 3.2), "p2.16xlarge": newCPU(64, 2.3), @@ -512,6 +540,24 @@ var instanceTypeCPU = map[string]CPU{ "r6id.large": newCPU(2, 3.5), "r6id.metal": newCPU(128, 3.5), "r6id.xlarge": newCPU(4, 3.5), + "r6idn.12xlarge": newCPU(48, 3.5), + "r6idn.16xlarge": newCPU(64, 3.5), + "r6idn.24xlarge": newCPU(96, 3.5), + "r6idn.2xlarge": newCPU(8, 3.5), + "r6idn.32xlarge": newCPU(128, 3.5), + "r6idn.4xlarge": newCPU(16, 3.5), + "r6idn.8xlarge": newCPU(32, 3.5), + "r6idn.large": newCPU(2, 3.5), + "r6idn.xlarge": newCPU(4, 3.5), + "r6in.12xlarge": newCPU(48, 3.5), + "r6in.16xlarge": newCPU(64, 3.5), + "r6in.24xlarge": newCPU(96, 3.5), + "r6in.2xlarge": newCPU(8, 3.5), + "r6in.32xlarge": newCPU(128, 3.5), + "r6in.4xlarge": newCPU(16, 3.5), + "r6in.8xlarge": newCPU(32, 3.5), + "r6in.large": newCPU(2, 3.5), + "r6in.xlarge": newCPU(4, 3.5), "t2.2xlarge": newCPU(8, 2.3), "t2.large": newCPU(2, 2.3), "t2.medium": newCPU(2, 2.3), @@ -540,7 +586,11 @@ var instanceTypeCPU = map[string]CPU{ "t4g.nano": newCPU(2, 2.5), "t4g.small": newCPU(2, 2.5), "t4g.xlarge": newCPU(4, 2.5), + "trn1.2xlarge": newCPU(8, 3.5), + "trn1.32xlarge": newCPU(128, 3.5), "u-12tb1.112xlarge": newCPU(448, 2.1), + "u-18tb1.112xlarge": newCPU(448, 2.7), + "u-24tb1.112xlarge": newCPU(448, 2.7), "u-3tb1.56xlarge": newCPU(224, 2.1), "u-6tb1.112xlarge": newCPU(448, 2.1), "u-6tb1.56xlarge": newCPU(224, 2.1),