From f9a61806862daa259d552981a8eb1fb312d1a6bb Mon Sep 17 00:00:00 2001 From: GuyTempleton Date: Mon, 13 Dec 2021 14:54:33 +0000 Subject: [PATCH] CA - AWS - Update Static Instance List --- .../cloudprovider/aws/ec2_instance_types.go | 581 +++--------------- 1 file changed, 84 insertions(+), 497 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go index 2b66097f419a..fd806f36e410 100644 --- a/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go +++ b/cluster-autoscaler/cloudprovider/aws/ec2_instance_types.go @@ -28,17 +28,10 @@ type InstanceType struct { } // StaticListLastUpdateTime is a string declaring the last time the static list was updated. -var StaticListLastUpdateTime = "2021-11-29" +var StaticListLastUpdateTime = "2021-12-13" // InstanceTypes is a map of ec2 resources var InstanceTypes = map[string]*InstanceType{ - "a1": { - InstanceType: "a1", - VCPU: 16, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "a1.2xlarge": { InstanceType: "a1.2xlarge", VCPU: 8, @@ -95,13 +88,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c3": { - InstanceType: "c3", - VCPU: 32, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c3.2xlarge": { InstanceType: "c3.2xlarge", VCPU: 8, @@ -137,13 +123,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c4": { - InstanceType: "c4", - VCPU: 36, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c4.2xlarge": { InstanceType: "c4.2xlarge", VCPU: 8, @@ -179,13 +158,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c5": { - InstanceType: "c5", - VCPU: 72, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c5.12xlarge": { InstanceType: "c5.12xlarge", VCPU: 48, @@ -361,13 +333,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c5d": { - InstanceType: "c5d", - VCPU: 72, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c5d.12xlarge": { InstanceType: "c5d.12xlarge", VCPU: 48, @@ -431,13 +396,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c5n": { - InstanceType: "c5n", - VCPU: 72, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c5n.18xlarge": { InstanceType: "c5n.18xlarge", VCPU: 72, @@ -487,13 +445,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "c6g": { - InstanceType: "c6g", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "c6g.12xlarge": { InstanceType: "c6g.12xlarge", VCPU: 48, @@ -557,13 +508,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "c6gd": { - InstanceType: "c6gd", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "c6gd.12xlarge": { InstanceType: "c6gd.12xlarge", VCPU: 48, @@ -627,13 +571,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "c6gn": { - InstanceType: "c6gn", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "c6gn.12xlarge": { InstanceType: "c6gn.12xlarge", VCPU: 48, @@ -683,13 +620,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "c6gn.metal": { - InstanceType: "c6gn.metal", - VCPU: 64, - MemoryMb: 131072, - GPU: 0, - Architecture: "arm64", - }, "c6gn.xlarge": { InstanceType: "c6gn.xlarge", VCPU: 4, @@ -697,13 +627,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "c6i": { - InstanceType: "c6i", - VCPU: 128, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "c6i.12xlarge": { InstanceType: "c6i.12xlarge", VCPU: 48, @@ -781,20 +704,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "cr1.8xlarge": { - InstanceType: "cr1.8xlarge", - VCPU: 32, - MemoryMb: 249856, - GPU: 0, - Architecture: "amd64", - }, - "d2": { - InstanceType: "d2", - VCPU: 36, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "d2.2xlarge": { InstanceType: "d2.2xlarge", VCPU: 8, @@ -893,25 +802,11 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "dl1": { - InstanceType: "dl1", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "dl1.24xlarge": { InstanceType: "dl1.24xlarge", VCPU: 96, MemoryMb: 786432, - GPU: 0, - Architecture: "amd64", - }, - "f1": { - InstanceType: "f1", - VCPU: 64, - MemoryMb: 0, - GPU: 0, + GPU: 8, Architecture: "amd64", }, "f1.16xlarge": { @@ -935,13 +830,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "g2": { - InstanceType: "g2", - VCPU: 32, - MemoryMb: 0, - GPU: 4, - Architecture: "amd64", - }, "g2.2xlarge": { InstanceType: "g2.2xlarge", VCPU: 8, @@ -956,13 +844,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 4, Architecture: "amd64", }, - "g3": { - InstanceType: "g3", - VCPU: 64, - MemoryMb: 0, - GPU: 4, - Architecture: "amd64", - }, "g3.16xlarge": { InstanceType: "g3.16xlarge", VCPU: 64, @@ -991,13 +872,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "amd64", }, - "g4ad": { - InstanceType: "g4ad", - VCPU: 192, - MemoryMb: 0, - GPU: 2, - Architecture: "amd64", - }, "g4ad.16xlarge": { InstanceType: "g4ad.16xlarge", VCPU: 64, @@ -1033,13 +907,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "amd64", }, - "g4dn": { - InstanceType: "g4dn", - VCPU: 96, - MemoryMb: 0, - GPU: 8, - Architecture: "amd64", - }, "g4dn.12xlarge": { InstanceType: "g4dn.12xlarge", VCPU: 48, @@ -1089,13 +956,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "amd64", }, - "g5": { - InstanceType: "g5", - VCPU: 192, - MemoryMb: 0, - GPU: 8, - Architecture: "amd64", - }, "g5.12xlarge": { InstanceType: "g5.12xlarge", VCPU: 48, @@ -1152,13 +1012,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "amd64", }, - "g5g": { - InstanceType: "g5g", - VCPU: 64, - MemoryMb: 0, - GPU: 2, - Architecture: "arm64", - }, "g5g.16xlarge": { InstanceType: "g5g.16xlarge", VCPU: 64, @@ -1201,13 +1054,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "arm64", }, - "h1": { - InstanceType: "h1", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "h1.16xlarge": { InstanceType: "h1.16xlarge", VCPU: 64, @@ -1236,20 +1082,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "hs1.8xlarge": { - InstanceType: "hs1.8xlarge", - VCPU: 16, - MemoryMb: 119808, - GPU: 0, - Architecture: "amd64", - }, - "i2": { - InstanceType: "i2", - VCPU: 32, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "i2.2xlarge": { InstanceType: "i2.2xlarge", VCPU: 8, @@ -1271,13 +1103,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "i2.large": { - InstanceType: "i2.large", - VCPU: 2, - MemoryMb: 15360, - GPU: 0, - Architecture: "amd64", - }, "i2.xlarge": { InstanceType: "i2.xlarge", VCPU: 4, @@ -1285,13 +1110,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "i3": { - InstanceType: "i3", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "i3.16xlarge": { InstanceType: "i3.16xlarge", VCPU: 64, @@ -1329,7 +1147,7 @@ var InstanceTypes = map[string]*InstanceType{ }, "i3.metal": { InstanceType: "i3.metal", - VCPU: 64, + VCPU: 72, MemoryMb: 524288, GPU: 0, Architecture: "amd64", @@ -1341,13 +1159,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "i3en": { - InstanceType: "i3en", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "i3en.12xlarge": { InstanceType: "i3en.12xlarge", VCPU: 48, @@ -1404,19 +1215,47 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "i3p.16xlarge": { - InstanceType: "i3p.16xlarge", + "im4gn.16xlarge": { + InstanceType: "im4gn.16xlarge", VCPU: 64, - MemoryMb: 499712, + MemoryMb: 262144, GPU: 0, - Architecture: "amd64", + Architecture: "arm64", }, - "inf1": { - InstanceType: "inf1", - VCPU: 96, - MemoryMb: 0, + "im4gn.2xlarge": { + InstanceType: "im4gn.2xlarge", + VCPU: 8, + MemoryMb: 32768, GPU: 0, - Architecture: "amd64", + Architecture: "arm64", + }, + "im4gn.4xlarge": { + InstanceType: "im4gn.4xlarge", + VCPU: 16, + MemoryMb: 65536, + GPU: 0, + Architecture: "arm64", + }, + "im4gn.8xlarge": { + InstanceType: "im4gn.8xlarge", + VCPU: 32, + MemoryMb: 131072, + GPU: 0, + Architecture: "arm64", + }, + "im4gn.large": { + InstanceType: "im4gn.large", + VCPU: 2, + MemoryMb: 8192, + GPU: 0, + Architecture: "arm64", + }, + "im4gn.xlarge": { + InstanceType: "im4gn.xlarge", + VCPU: 4, + MemoryMb: 16384, + GPU: 0, + Architecture: "arm64", }, "inf1.24xlarge": { InstanceType: "inf1.24xlarge", @@ -1446,6 +1285,48 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, + "is4gen.2xlarge": { + InstanceType: "is4gen.2xlarge", + VCPU: 8, + MemoryMb: 49152, + GPU: 0, + Architecture: "arm64", + }, + "is4gen.4xlarge": { + InstanceType: "is4gen.4xlarge", + VCPU: 16, + MemoryMb: 98304, + GPU: 0, + Architecture: "arm64", + }, + "is4gen.8xlarge": { + InstanceType: "is4gen.8xlarge", + VCPU: 32, + MemoryMb: 196608, + GPU: 0, + Architecture: "arm64", + }, + "is4gen.large": { + InstanceType: "is4gen.large", + VCPU: 2, + MemoryMb: 12288, + GPU: 0, + Architecture: "arm64", + }, + "is4gen.medium": { + InstanceType: "is4gen.medium", + VCPU: 1, + MemoryMb: 6144, + GPU: 0, + Architecture: "arm64", + }, + "is4gen.xlarge": { + InstanceType: "is4gen.xlarge", + VCPU: 4, + MemoryMb: 24576, + GPU: 0, + Architecture: "arm64", + }, "m1.large": { InstanceType: "m1.large", VCPU: 2, @@ -1456,7 +1337,7 @@ var InstanceTypes = map[string]*InstanceType{ "m1.medium": { InstanceType: "m1.medium", VCPU: 1, - MemoryMb: 3840, + MemoryMb: 3788, GPU: 0, Architecture: "amd64", }, @@ -1495,13 +1376,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m3": { - InstanceType: "m3", - VCPU: 8, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m3.2xlarge": { InstanceType: "m3.2xlarge", VCPU: 8, @@ -1530,13 +1404,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m4": { - InstanceType: "m4", - VCPU: 40, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m4.10xlarge": { InstanceType: "m4.10xlarge", VCPU: 40, @@ -1579,13 +1446,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m5": { - InstanceType: "m5", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m5.12xlarge": { InstanceType: "m5.12xlarge", VCPU: 48, @@ -1761,13 +1621,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m5d": { - InstanceType: "m5d", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m5d.12xlarge": { InstanceType: "m5d.12xlarge", VCPU: 48, @@ -1831,13 +1684,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m5dn": { - InstanceType: "m5dn", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m5dn.12xlarge": { InstanceType: "m5dn.12xlarge", VCPU: 48, @@ -1901,13 +1747,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m5n": { - InstanceType: "m5n", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m5n.12xlarge": { InstanceType: "m5n.12xlarge", VCPU: 48, @@ -1971,13 +1810,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m5zn": { - InstanceType: "m5zn", - VCPU: 48, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m5zn.12xlarge": { InstanceType: "m5zn.12xlarge", VCPU: 48, @@ -2027,13 +1859,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m6a": { - InstanceType: "m6a", - VCPU: 192, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m6a.12xlarge": { InstanceType: "m6a.12xlarge", VCPU: 48, @@ -2104,13 +1929,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "m6g": { - InstanceType: "m6g", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "m6g.12xlarge": { InstanceType: "m6g.12xlarge", VCPU: 48, @@ -2174,13 +1992,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "m6gd": { - InstanceType: "m6gd", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "m6gd.12xlarge": { InstanceType: "m6gd.12xlarge", VCPU: 48, @@ -2244,13 +2055,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "m6i": { - InstanceType: "m6i", - VCPU: 128, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "m6i.12xlarge": { InstanceType: "m6i.12xlarge", VCPU: 48, @@ -2321,13 +2125,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "mac1": { - InstanceType: "mac1", - VCPU: 12, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "mac1.metal": { InstanceType: "mac1.metal", VCPU: 12, @@ -2335,13 +2132,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "p2": { - InstanceType: "p2", - VCPU: 64, - MemoryMb: 0, - GPU: 16, - Architecture: "amd64", - }, "p2.16xlarge": { InstanceType: "p2.16xlarge", VCPU: 64, @@ -2363,13 +2153,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 1, Architecture: "amd64", }, - "p3": { - InstanceType: "p3", - VCPU: 64, - MemoryMb: 0, - GPU: 8, - Architecture: "amd64", - }, "p3.16xlarge": { InstanceType: "p3.16xlarge", VCPU: 64, @@ -2391,13 +2174,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 4, Architecture: "amd64", }, - "p3dn": { - InstanceType: "p3dn", - VCPU: 96, - MemoryMb: 0, - GPU: 8, - Architecture: "amd64", - }, "p3dn.24xlarge": { InstanceType: "p3dn.24xlarge", VCPU: 96, @@ -2405,13 +2181,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 8, Architecture: "amd64", }, - "p4d": { - InstanceType: "p4d", - VCPU: 96, - MemoryMb: 0, - GPU: 8, - Architecture: "amd64", - }, "p4d.24xlarge": { InstanceType: "p4d.24xlarge", VCPU: 96, @@ -2419,13 +2188,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 8, Architecture: "amd64", }, - "r3": { - InstanceType: "r3", - VCPU: 32, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r3.2xlarge": { InstanceType: "r3.2xlarge", VCPU: 8, @@ -2450,7 +2212,7 @@ var InstanceTypes = map[string]*InstanceType{ "r3.large": { InstanceType: "r3.large", VCPU: 2, - MemoryMb: 15616, + MemoryMb: 15360, GPU: 0, Architecture: "amd64", }, @@ -2461,13 +2223,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r4": { - InstanceType: "r4", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r4.16xlarge": { InstanceType: "r4.16xlarge", VCPU: 64, @@ -2510,13 +2265,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r5": { - InstanceType: "r5", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r5.12xlarge": { InstanceType: "r5.12xlarge", VCPU: 48, @@ -2692,13 +2440,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r5b": { - InstanceType: "r5b", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r5b.12xlarge": { InstanceType: "r5b.12xlarge", VCPU: 48, @@ -2762,13 +2503,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r5d": { - InstanceType: "r5d", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r5d.12xlarge": { InstanceType: "r5d.12xlarge", VCPU: 48, @@ -2832,13 +2566,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r5dn": { - InstanceType: "r5dn", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r5dn.12xlarge": { InstanceType: "r5dn.12xlarge", VCPU: 48, @@ -2902,13 +2629,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r5n": { - InstanceType: "r5n", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r5n.12xlarge": { InstanceType: "r5n.12xlarge", VCPU: 48, @@ -2972,13 +2692,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "r6g": { - InstanceType: "r6g", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "r6g.12xlarge": { InstanceType: "r6g.12xlarge", VCPU: 48, @@ -3042,13 +2755,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "r6gd": { - InstanceType: "r6gd", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "r6gd.12xlarge": { InstanceType: "r6gd.12xlarge", VCPU: 48, @@ -3112,13 +2818,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "r6i": { - InstanceType: "r6i", - VCPU: 128, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "r6i.12xlarge": { InstanceType: "r6i.12xlarge", VCPU: 48, @@ -3245,13 +2944,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "t3": { - InstanceType: "t3", - VCPU: 8, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "t3.2xlarge": { InstanceType: "t3.2xlarge", VCPU: 8, @@ -3399,13 +3091,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "u-12tb1": { - InstanceType: "u-12tb1", - VCPU: 448, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "u-12tb1.112xlarge": { InstanceType: "u-12tb1.112xlarge", VCPU: 448, @@ -3413,48 +3098,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "u-12tb1.metal": { - InstanceType: "u-12tb1.metal", - VCPU: 448, - MemoryMb: 12582912, - GPU: 0, - Architecture: "amd64", - }, - "u-18tb1": { - InstanceType: "u-18tb1", - VCPU: 448, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, - "u-18tb1.metal": { - InstanceType: "u-18tb1.metal", - VCPU: 448, - MemoryMb: 18874368, - GPU: 0, - Architecture: "amd64", - }, - "u-24tb1": { - InstanceType: "u-24tb1", - VCPU: 448, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, - "u-24tb1.metal": { - InstanceType: "u-24tb1.metal", - VCPU: 448, - MemoryMb: 25165824, - GPU: 0, - Architecture: "amd64", - }, - "u-6tb1": { - InstanceType: "u-6tb1", - VCPU: 448, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "u-6tb1.112xlarge": { InstanceType: "u-6tb1.112xlarge", VCPU: 448, @@ -3469,20 +3112,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "u-6tb1.metal": { - InstanceType: "u-6tb1.metal", - VCPU: 448, - MemoryMb: 6291456, - GPU: 0, - Architecture: "amd64", - }, - "u-9tb1": { - InstanceType: "u-9tb1", - VCPU: 448, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "u-9tb1.112xlarge": { InstanceType: "u-9tb1.112xlarge", VCPU: 448, @@ -3490,20 +3119,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "u-9tb1.metal": { - InstanceType: "u-9tb1.metal", - VCPU: 448, - MemoryMb: 9437184, - GPU: 0, - Architecture: "amd64", - }, - "vt1": { - InstanceType: "vt1", - VCPU: 96, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "vt1.24xlarge": { InstanceType: "vt1.24xlarge", VCPU: 96, @@ -3525,13 +3140,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "x1": { - InstanceType: "x1", - VCPU: 128, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "x1.16xlarge": { InstanceType: "x1.16xlarge", VCPU: 64, @@ -3546,13 +3154,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "x1e": { - InstanceType: "x1e", - VCPU: 128, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "x1e.16xlarge": { InstanceType: "x1e.16xlarge", VCPU: 64, @@ -3595,13 +3196,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "amd64", }, - "x2gd": { - InstanceType: "x2gd", - VCPU: 64, - MemoryMb: 0, - GPU: 0, - Architecture: "arm64", - }, "x2gd.12xlarge": { InstanceType: "x2gd.12xlarge", VCPU: 48, @@ -3665,13 +3259,6 @@ var InstanceTypes = map[string]*InstanceType{ GPU: 0, Architecture: "arm64", }, - "z1d": { - InstanceType: "z1d", - VCPU: 48, - MemoryMb: 0, - GPU: 0, - Architecture: "amd64", - }, "z1d.12xlarge": { InstanceType: "z1d.12xlarge", VCPU: 48,