From 0021b282efa89b12e9c08d6d669122d9a6db5f27 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 9 Mar 2023 14:33:21 -0800 Subject: [PATCH] env/aws: update ec2 cpu info data (#16417) Update AWS EC2 CPU tables using `make ec2info` --- .changelog/16417.txt | 3 +++ client/fingerprint/env_aws_cpu.go | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 .changelog/16417.txt diff --git a/.changelog/16417.txt b/.changelog/16417.txt new file mode 100644 index 000000000..b60ae5b7a --- /dev/null +++ b/.changelog/16417.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 97963cb5f..5c188458a 100644 --- a/client/fingerprint/env_aws_cpu.go +++ b/client/fingerprint/env_aws_cpu.go @@ -172,8 +172,8 @@ var instanceTypeCPU = map[string]CPU{ "c7g.8xlarge": newCPU(32, 2.6), "c7g.large": newCPU(2, 2.6), "c7g.medium": newCPU(1, 2.6), + "c7g.metal": newCPU(64, 2.6), "c7g.xlarge": newCPU(4, 2.6), - "cc2.8xlarge": newCPU(32, 2.6), "d2.2xlarge": newCPU(8, 2.4), "d2.4xlarge": newCPU(16, 2.4), "d2.8xlarge": newCPU(36, 2.4), @@ -409,6 +409,15 @@ var instanceTypeCPU = map[string]CPU{ "m6in.8xlarge": newCPU(32, 3.5), "m6in.large": newCPU(2, 3.5), "m6in.xlarge": newCPU(4, 3.5), + "m7g.12xlarge": newCPU(48, 2.6), + "m7g.16xlarge": newCPU(64, 2.6), + "m7g.2xlarge": newCPU(8, 2.6), + "m7g.4xlarge": newCPU(16, 2.6), + "m7g.8xlarge": newCPU(32, 2.6), + "m7g.large": newCPU(2, 2.6), + "m7g.medium": newCPU(1, 2.6), + "m7g.metal": newCPU(64, 2.6), + "m7g.xlarge": newCPU(4, 2.6), "mac1.metal": newCPU(12, 3.2), "mac2.metal": newCPU(8, 3.2), "p2.16xlarge": newCPU(64, 2.3), @@ -558,6 +567,15 @@ var instanceTypeCPU = map[string]CPU{ "r6in.8xlarge": newCPU(32, 3.5), "r6in.large": newCPU(2, 3.5), "r6in.xlarge": newCPU(4, 3.5), + "r7g.12xlarge": newCPU(48, 2.6), + "r7g.16xlarge": newCPU(64, 2.6), + "r7g.2xlarge": newCPU(8, 2.6), + "r7g.4xlarge": newCPU(16, 2.6), + "r7g.8xlarge": newCPU(32, 2.6), + "r7g.large": newCPU(2, 2.6), + "r7g.medium": newCPU(1, 2.6), + "r7g.metal": newCPU(64, 2.6), + "r7g.xlarge": newCPU(4, 2.6), "t2.2xlarge": newCPU(8, 2.3), "t2.large": newCPU(2, 2.3), "t2.medium": newCPU(2, 2.3),