From a0cb265db34b36e4c4cd0555c95e3c4030e7686f Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Tue, 2 Aug 2022 07:59:58 -0500 Subject: [PATCH] build: update aws env cpu info --- client/fingerprint/env_aws_cpu.go | 22 ++++++++++++++++++++++ tools/go.mod | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go index d27c80aa7..5678a1105 100644 --- a/client/fingerprint/env_aws_cpu.go +++ b/client/fingerprint/env_aws_cpu.go @@ -382,6 +382,7 @@ var instanceTypeCPU = map[string]CPU{ "m6id.metal": newCPU(128, 3.5), "m6id.xlarge": newCPU(4, 3.5), "mac1.metal": newCPU(12, 3.2), + "mac2.metal": newCPU(8, 3.2), "p2.16xlarge": newCPU(64, 2.3), "p2.8xlarge": newCPU(32, 2.7), "p2.xlarge": newCPU(4, 2.7), @@ -462,6 +463,17 @@ var instanceTypeCPU = map[string]CPU{ "r5n.large": newCPU(2, 3.1), "r5n.metal": newCPU(96, 3.1), "r5n.xlarge": newCPU(4, 3.1), + "r6a.12xlarge": newCPU(48, 3.6), + "r6a.16xlarge": newCPU(64, 3.6), + "r6a.24xlarge": newCPU(96, 3.6), + "r6a.2xlarge": newCPU(8, 3.6), + "r6a.32xlarge": newCPU(128, 3.6), + "r6a.48xlarge": newCPU(192, 3.6), + "r6a.4xlarge": newCPU(16, 3.6), + "r6a.8xlarge": newCPU(32, 3.6), + "r6a.large": newCPU(2, 3.6), + "r6a.metal": newCPU(192, 3.6), + "r6a.xlarge": newCPU(4, 3.6), "r6g.12xlarge": newCPU(48, 2.5), "r6g.16xlarge": newCPU(64, 2.5), "r6g.2xlarge": newCPU(8, 2.5), @@ -490,6 +502,16 @@ var instanceTypeCPU = map[string]CPU{ "r6i.large": newCPU(2, 3.5), "r6i.metal": newCPU(128, 3.5), "r6i.xlarge": newCPU(4, 3.5), + "r6id.12xlarge": newCPU(48, 3.5), + "r6id.16xlarge": newCPU(64, 3.5), + "r6id.24xlarge": newCPU(96, 3.5), + "r6id.2xlarge": newCPU(8, 3.5), + "r6id.32xlarge": newCPU(128, 3.5), + "r6id.4xlarge": newCPU(16, 3.5), + "r6id.8xlarge": newCPU(32, 3.5), + "r6id.large": newCPU(2, 3.5), + "r6id.metal": newCPU(128, 3.5), + "r6id.xlarge": newCPU(4, 3.5), "t2.2xlarge": newCPU(8, 2.3), "t2.large": newCPU(2, 2.3), "t2.medium": newCPU(2, 2.3), diff --git a/tools/go.mod b/tools/go.mod index dd1d3a7f9..31a78edc4 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/hashicorp/nomad/tools -go 1.17 +go 1.18 require ( github.com/aws/aws-sdk-go v1.37.26