From 3dfa19d3d4f8a11b4c90aae93a606902793866ae Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 9 Mar 2023 22:03:39 +0000 Subject: [PATCH 1/2] backport of commit 61e492f53649eace05b82ba2e27d2654e6a468d3 --- client/fingerprint/env_aws_cpu.go | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go index 97963cb5f26..5c188458a0e 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), From 60ac4e31251010ec4baa9a94a48135bca21dce23 Mon Sep 17 00:00:00 2001 From: Michael Schurter Date: Thu, 9 Mar 2023 22:14:48 +0000 Subject: [PATCH 2/2] backport of commit 01f2d6af6f6fe387ed48c67d8ee1086b935cbabc --- .changelog/16417.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/16417.txt diff --git a/.changelog/16417.txt b/.changelog/16417.txt new file mode 100644 index 00000000000..b60ae5b7a02 --- /dev/null +++ b/.changelog/16417.txt @@ -0,0 +1,3 @@ +```release-note:improvement +env/ec2: update cpu metadata +```