From 652de761bf8bc65f640ff1141b73d7e9bdf5f428 Mon Sep 17 00:00:00 2001 From: Seth Hoenig Date: Tue, 8 Feb 2022 12:44:00 -0600 Subject: [PATCH] env: update aws cpu configs By running the tools/ec2info tool --- client/fingerprint/env_aws_cpu.go | 79 +++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go index 55572f2ca..3b418b116 100644 --- a/client/fingerprint/env_aws_cpu.go +++ b/client/fingerprint/env_aws_cpu.go @@ -125,6 +125,16 @@ var instanceTypeCPU = map[string]CPU{ "c6gn.large": newCPU(2, 2.5), "c6gn.medium": newCPU(1, 2.5), "c6gn.xlarge": newCPU(4, 2.5), + "c6i.12xlarge": newCPU(48, 3.5), + "c6i.16xlarge": newCPU(64, 3.5), + "c6i.24xlarge": newCPU(96, 3.5), + "c6i.2xlarge": newCPU(8, 3.5), + "c6i.32xlarge": newCPU(128, 3.5), + "c6i.4xlarge": newCPU(16, 3.5), + "c6i.8xlarge": newCPU(32, 3.5), + "c6i.large": newCPU(2, 3.5), + "c6i.metal": newCPU(128, 3.5), + "c6i.xlarge": newCPU(4, 3.5), "cc2.8xlarge": newCPU(32, 2.6), "d2.2xlarge": newCPU(8, 2.4), "d2.4xlarge": newCPU(16, 2.4), @@ -140,6 +150,7 @@ var instanceTypeCPU = map[string]CPU{ "d3en.6xlarge": newCPU(24, 3.1), "d3en.8xlarge": newCPU(32, 3.1), "d3en.xlarge": newCPU(4, 3.1), + "dl1.24xlarge": newCPU(96, 3), "f1.16xlarge": newCPU(64, 2.3), "f1.2xlarge": newCPU(8, 2.3), "f1.4xlarge": newCPU(16, 2.3), @@ -150,8 +161,10 @@ var instanceTypeCPU = map[string]CPU{ "g3.8xlarge": newCPU(32, 2.7), "g3s.xlarge": newCPU(4, 2.7), "g4ad.16xlarge": newCPU(64, 3), + "g4ad.2xlarge": newCPU(8, 3), "g4ad.4xlarge": newCPU(16, 3), "g4ad.8xlarge": newCPU(32, 3), + "g4ad.xlarge": newCPU(4, 3), "g4dn.12xlarge": newCPU(48, 2.5), "g4dn.16xlarge": newCPU(64, 2.5), "g4dn.2xlarge": newCPU(8, 2.5), @@ -159,10 +172,25 @@ var instanceTypeCPU = map[string]CPU{ "g4dn.8xlarge": newCPU(32, 2.5), "g4dn.metal": newCPU(96, 2.5), "g4dn.xlarge": newCPU(4, 2.5), + "g5.12xlarge": newCPU(48, 3.3), + "g5.16xlarge": newCPU(64, 3.3), + "g5.24xlarge": newCPU(96, 3.3), + "g5.2xlarge": newCPU(8, 3.3), + "g5.48xlarge": newCPU(192, 3.3), + "g5.4xlarge": newCPU(16, 3.3), + "g5.8xlarge": newCPU(32, 3.3), + "g5.xlarge": newCPU(4, 3.3), + "g5g.16xlarge": newCPU(64, 2.5), + "g5g.2xlarge": newCPU(8, 2.5), + "g5g.4xlarge": newCPU(16, 2.5), + "g5g.8xlarge": newCPU(32, 2.5), + "g5g.metal": newCPU(64, 2.5), + "g5g.xlarge": newCPU(4, 2.5), "h1.16xlarge": newCPU(64, 2.3), "h1.2xlarge": newCPU(8, 2.3), "h1.4xlarge": newCPU(16, 2.3), "h1.8xlarge": newCPU(32, 2.3), + "hpc6a.48xlarge": newCPU(96, 3.6), "i2.2xlarge": newCPU(8, 2.5), "i2.4xlarge": newCPU(16, 2.5), "i2.8xlarge": newCPU(32, 2.5), @@ -182,10 +210,22 @@ var instanceTypeCPU = map[string]CPU{ "i3en.large": newCPU(2, 3.1), "i3en.metal": newCPU(96, 3.1), "i3en.xlarge": newCPU(4, 3.1), + "im4gn.16xlarge": newCPU(64, 2.5), + "im4gn.2xlarge": newCPU(8, 2.5), + "im4gn.4xlarge": newCPU(16, 2.5), + "im4gn.8xlarge": newCPU(32, 2.5), + "im4gn.large": newCPU(2, 2.5), + "im4gn.xlarge": newCPU(4, 2.5), "inf1.24xlarge": newCPU(96, 2.5), "inf1.2xlarge": newCPU(8, 2.5), "inf1.6xlarge": newCPU(24, 2.5), "inf1.xlarge": newCPU(4, 2.5), + "is4gen.2xlarge": newCPU(8, 2.5), + "is4gen.4xlarge": newCPU(16, 2.5), + "is4gen.8xlarge": newCPU(32, 2.5), + "is4gen.large": newCPU(2, 2.5), + "is4gen.medium": newCPU(1, 2.5), + "is4gen.xlarge": newCPU(4, 2.5), "m3.2xlarge": newCPU(8, 2.5), "m3.large": newCPU(2, 2.5), "m3.medium": newCPU(1, 2.5), @@ -255,6 +295,16 @@ var instanceTypeCPU = map[string]CPU{ "m5zn.large": newCPU(2, 4.5), "m5zn.metal": newCPU(48, 4.5), "m5zn.xlarge": newCPU(4, 4.5), + "m6a.12xlarge": newCPU(48, 3.6), + "m6a.16xlarge": newCPU(64, 3.6), + "m6a.24xlarge": newCPU(96, 3.6), + "m6a.2xlarge": newCPU(8, 3.6), + "m6a.32xlarge": newCPU(128, 3.6), + "m6a.48xlarge": newCPU(192, 3.6), + "m6a.4xlarge": newCPU(16, 3.6), + "m6a.8xlarge": newCPU(32, 3.6), + "m6a.large": newCPU(2, 3.6), + "m6a.xlarge": newCPU(4, 3.6), "m6g.12xlarge": newCPU(48, 2.5), "m6g.16xlarge": newCPU(64, 2.5), "m6g.2xlarge": newCPU(8, 2.5), @@ -273,6 +323,16 @@ var instanceTypeCPU = map[string]CPU{ "m6gd.medium": newCPU(1, 2.5), "m6gd.metal": newCPU(64, 2.5), "m6gd.xlarge": newCPU(4, 2.5), + "m6i.12xlarge": newCPU(48, 3.5), + "m6i.16xlarge": newCPU(64, 3.5), + "m6i.24xlarge": newCPU(96, 3.5), + "m6i.2xlarge": newCPU(8, 3.5), + "m6i.32xlarge": newCPU(128, 3.5), + "m6i.4xlarge": newCPU(16, 3.5), + "m6i.8xlarge": newCPU(32, 3.5), + "m6i.large": newCPU(2, 3.5), + "m6i.metal": newCPU(128, 3.5), + "m6i.xlarge": newCPU(4, 3.5), "mac1.metal": newCPU(12, 3.2), "p2.16xlarge": newCPU(64, 2.3), "p2.8xlarge": newCPU(32, 2.7), @@ -372,6 +432,16 @@ var instanceTypeCPU = map[string]CPU{ "r6gd.medium": newCPU(1, 2.5), "r6gd.metal": newCPU(64, 2.5), "r6gd.xlarge": newCPU(4, 2.5), + "r6i.12xlarge": newCPU(48, 3.5), + "r6i.16xlarge": newCPU(64, 3.5), + "r6i.24xlarge": newCPU(96, 3.5), + "r6i.2xlarge": newCPU(8, 3.5), + "r6i.32xlarge": newCPU(128, 3.5), + "r6i.4xlarge": newCPU(16, 3.5), + "r6i.8xlarge": newCPU(32, 3.5), + "r6i.large": newCPU(2, 3.5), + "r6i.metal": newCPU(128, 3.5), + "r6i.xlarge": newCPU(4, 3.5), "t2.2xlarge": newCPU(8, 2.3), "t2.large": newCPU(2, 2.3), "t2.medium": newCPU(2, 2.3), @@ -404,6 +474,9 @@ var instanceTypeCPU = map[string]CPU{ "u-6tb1.112xlarge": newCPU(448, 2.1), "u-6tb1.56xlarge": newCPU(224, 2.1), "u-9tb1.112xlarge": newCPU(448, 2.1), + "vt1.24xlarge": newCPU(96, 2.5), + "vt1.3xlarge": newCPU(12, 2.5), + "vt1.6xlarge": newCPU(24, 2.5), "x1.16xlarge": newCPU(64, 2.3), "x1.32xlarge": newCPU(128, 2.3), "x1e.16xlarge": newCPU(64, 2.3), @@ -421,6 +494,12 @@ var instanceTypeCPU = map[string]CPU{ "x2gd.medium": newCPU(1, 2.5), "x2gd.metal": newCPU(64, 2.5), "x2gd.xlarge": newCPU(4, 2.5), + "x2iezn.12xlarge": newCPU(48, 4.5), + "x2iezn.2xlarge": newCPU(8, 4.5), + "x2iezn.4xlarge": newCPU(16, 4.5), + "x2iezn.6xlarge": newCPU(24, 4.5), + "x2iezn.8xlarge": newCPU(32, 4.5), + "x2iezn.metal": newCPU(48, 4.5), "z1d.12xlarge": newCPU(48, 4), "z1d.2xlarge": newCPU(8, 4), "z1d.3xlarge": newCPU(12, 4),