diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go index 6198b03efca70..6484cfa579015 100644 --- a/hack/machine_types/vpc_ip_resource_limit.go +++ b/hack/machine_types/vpc_ip_resource_limit.go @@ -120,6 +120,10 @@ var InstanceENIsAvailable = map[string]int{ "i3en.large": 3, "i3en.metal": 15, "i3en.xlarge": 4, + "inf1.xlarge": 4, + "inf1.2xlarge": 4, + "inf1.6xlarge": 8, + "inf1.24xlarge": 15, "m1.large": 3, "m1.medium": 2, "m1.small": 2, @@ -384,6 +388,10 @@ var InstanceIPsAvailable = map[string]int64{ "i3en.large": 10, "i3en.metal": 50, "i3en.xlarge": 15, + "inf1.xlarge": 10, + "inf1.2xlarge": 10, + "inf1.6xlarge": 30, + "inf1.24xlarge": 50, "m1.large": 10, "m1.medium": 6, "m1.small": 4, diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index 93919a6191c24..8c49e14bbf80a 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -80,6 +80,23 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ // NOTE: Content below is auto generated by `make update-machine-types` // BEGIN GENERATED CONTENT + // WARNING: ENIs not known for m6g.medium + // WARNING: IPs per ENI not known for m6g.medium + // WARNING: ENIs not known for m6g.8xlarge + // WARNING: IPs per ENI not known for m6g.8xlarge + // WARNING: ENIs not known for m6g.16xlarge + // WARNING: IPs per ENI not known for m6g.16xlarge + // WARNING: ENIs not known for m6g.2xlarge + // WARNING: IPs per ENI not known for m6g.2xlarge + // WARNING: ENIs not known for m6g.xlarge + // WARNING: IPs per ENI not known for m6g.xlarge + // WARNING: ENIs not known for m6g.4xlarge + // WARNING: IPs per ENI not known for m6g.4xlarge + // WARNING: ENIs not known for m6g.12xlarge + // WARNING: IPs per ENI not known for m6g.12xlarge + // WARNING: ENIs not known for m6g.large + // WARNING: IPs per ENI not known for m6g.large + // a1 family { Name: "a1.medium", @@ -207,7 +224,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ Name: "c3.8xlarge", MemoryGB: 60, ECU: 108, - Cores: 32, + Cores: 36, InstanceENIs: 8, InstanceIPsPerENI: 30, EphemeralDisks: []int{320, 320}, @@ -268,7 +285,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5.large", MemoryGB: 4, - ECU: 9, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -278,7 +295,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5.xlarge", MemoryGB: 8, - ECU: 17, + ECU: 20, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -288,7 +305,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5.2xlarge", MemoryGB: 16, - ECU: 34, + ECU: 39, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -298,7 +315,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5.4xlarge", MemoryGB: 32, - ECU: 68, + ECU: 73, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -308,7 +325,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5.9xlarge", MemoryGB: 72, - ECU: 141, + ECU: 139, Cores: 36, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -359,7 +376,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5d.large", MemoryGB: 4, - ECU: 9, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -369,7 +386,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5d.xlarge", MemoryGB: 8, - ECU: 17, + ECU: 20, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -379,7 +396,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5d.2xlarge", MemoryGB: 16, - ECU: 34, + ECU: 39, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -389,7 +406,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5d.4xlarge", MemoryGB: 32, - ECU: 68, + ECU: 73, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -399,7 +416,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5d.9xlarge", MemoryGB: 72, - ECU: 141, + ECU: 139, Cores: 36, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -450,7 +467,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.large", MemoryGB: 5.25, - ECU: 0, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -460,7 +477,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.xlarge", MemoryGB: 10.5, - ECU: 0, + ECU: 20, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -470,7 +487,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.2xlarge", MemoryGB: 21, - ECU: 0, + ECU: 39, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -480,7 +497,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.4xlarge", MemoryGB: 42, - ECU: 0, + ECU: 73, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -490,7 +507,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.9xlarge", MemoryGB: 96, - ECU: 0, + ECU: 139, Cores: 36, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -500,7 +517,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "c5n.18xlarge", MemoryGB: 192, - ECU: 0, + ECU: 281, Cores: 72, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -584,7 +601,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "f1.2xlarge", MemoryGB: 122, - ECU: 26, + ECU: 31, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -594,7 +611,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "f1.4xlarge", MemoryGB: 244, - ECU: 52, + ECU: 58, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -604,7 +621,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "f1.16xlarge", MemoryGB: 976, - ECU: 188, + ECU: 201, Cores: 64, InstanceENIs: 8, InstanceIPsPerENI: 50, @@ -638,7 +655,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "g3.4xlarge", MemoryGB: 122, - ECU: 47, + ECU: 58, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -649,7 +666,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "g3.8xlarge", MemoryGB: 244, - ECU: 94, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -660,7 +677,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "g3.16xlarge", MemoryGB: 488, - ECU: 188, + ECU: 201, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -751,7 +768,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "h1.2xlarge", MemoryGB: 32, - ECU: 26, + ECU: 31, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -761,7 +778,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "h1.4xlarge", MemoryGB: 64, - ECU: 53.5, + ECU: 58, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -771,7 +788,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "h1.8xlarge", MemoryGB: 128, - ECU: 99, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -781,7 +798,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "h1.16xlarge", MemoryGB: 256, - ECU: 188, + ECU: 201, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -844,7 +861,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3.large", MemoryGB: 15.25, - ECU: 7, + ECU: 8, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -854,7 +871,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3.xlarge", MemoryGB: 30.5, - ECU: 13, + ECU: 16, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -864,7 +881,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3.2xlarge", MemoryGB: 61, - ECU: 27, + ECU: 31, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -884,7 +901,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3.8xlarge", MemoryGB: 244, - ECU: 99, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -894,7 +911,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3.16xlarge", MemoryGB: 488, - ECU: 200, + ECU: 201, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -905,7 +922,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ Name: "i3.metal", MemoryGB: 512, ECU: 208, - Cores: 72, + Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, EphemeralDisks: []int{1900, 1900, 1900, 1900, 1900, 1900, 1900, 1900}, @@ -915,7 +932,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3en.large", MemoryGB: 16, - ECU: 0, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -935,7 +952,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3en.2xlarge", MemoryGB: 64, - ECU: 0, + ECU: 37, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -965,7 +982,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3en.12xlarge", MemoryGB: 384, - ECU: 0, + ECU: 168, Cores: 48, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -975,7 +992,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "i3en.24xlarge", MemoryGB: 768, - ECU: 0, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -992,6 +1009,47 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: []int{7500, 7500, 7500, 7500, 7500, 7500, 7500, 7500}, }, + // inf1 family + { + Name: "inf1.xlarge", + MemoryGB: 8, + ECU: 0, + Cores: 4, + InstanceENIs: 4, + InstanceIPsPerENI: 10, + EphemeralDisks: nil, + }, + + { + Name: "inf1.2xlarge", + MemoryGB: 16, + ECU: 0, + Cores: 8, + InstanceENIs: 4, + InstanceIPsPerENI: 10, + EphemeralDisks: nil, + }, + + { + Name: "inf1.6xlarge", + MemoryGB: 48, + ECU: 0, + Cores: 24, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "inf1.24xlarge", + MemoryGB: 192, + ECU: 0, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: nil, + }, + // m1 family { Name: "m1.small", @@ -1190,7 +1248,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.2xlarge", MemoryGB: 32, - ECU: 31, + ECU: 37, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1200,7 +1258,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.4xlarge", MemoryGB: 64, - ECU: 60, + ECU: 70, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1210,7 +1268,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.8xlarge", MemoryGB: 128, - ECU: 131, + ECU: 128, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1220,7 +1278,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.12xlarge", MemoryGB: 192, - ECU: 173, + ECU: 168, Cores: 48, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1230,7 +1288,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.16xlarge", MemoryGB: 256, - ECU: 262, + ECU: 256, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 30, @@ -1240,7 +1298,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5.24xlarge", MemoryGB: 384, - ECU: 345, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -1403,7 +1461,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.large", MemoryGB: 8, - ECU: 8, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -1423,7 +1481,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.2xlarge", MemoryGB: 32, - ECU: 31, + ECU: 37, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1433,7 +1491,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.4xlarge", MemoryGB: 64, - ECU: 60, + ECU: 70, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1443,7 +1501,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.8xlarge", MemoryGB: 128, - ECU: 131, + ECU: 128, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1453,7 +1511,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.12xlarge", MemoryGB: 192, - ECU: 173, + ECU: 168, Cores: 48, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1463,7 +1521,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.16xlarge", MemoryGB: 256, - ECU: 262, + ECU: 256, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 30, @@ -1473,7 +1531,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "m5d.24xlarge", MemoryGB: 384, - ECU: 345, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -1652,11 +1710,92 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: nil, }, + // m6g family + { + Name: "m6g.medium", + MemoryGB: 4, + ECU: 0, + Cores: 1, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.large", + MemoryGB: 8, + ECU: 0, + Cores: 2, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.xlarge", + MemoryGB: 16, + ECU: 0, + Cores: 4, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.2xlarge", + MemoryGB: 32, + ECU: 0, + Cores: 8, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.4xlarge", + MemoryGB: 64, + ECU: 0, + Cores: 16, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.8xlarge", + MemoryGB: 128, + ECU: 0, + Cores: 32, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.12xlarge", + MemoryGB: 192, + ECU: 0, + Cores: 48, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + + { + Name: "m6g.16xlarge", + MemoryGB: 256, + ECU: 0, + Cores: 64, + InstanceENIs: 0, + InstanceIPsPerENI: 0, + EphemeralDisks: nil, + }, + // p2 family { Name: "p2.xlarge", MemoryGB: 61, - ECU: 12, + ECU: 16, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1667,7 +1806,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p2.8xlarge", MemoryGB: 488, - ECU: 94, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1677,8 +1816,8 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p2.16xlarge", - MemoryGB: 768, - ECU: 188, + MemoryGB: 732, + ECU: 201, Cores: 64, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1690,7 +1829,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p3.2xlarge", MemoryGB: 61, - ECU: 26, + ECU: 31, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1701,7 +1840,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p3.8xlarge", MemoryGB: 244, - ECU: 94, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1712,7 +1851,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p3.16xlarge", MemoryGB: 488, - ECU: 188, + ECU: 201, Cores: 64, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1724,7 +1863,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "p3dn.24xlarge", MemoryGB: 768, - ECU: 345, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -1797,7 +1936,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r4.xlarge", MemoryGB: 30.5, - ECU: 13.5, + ECU: 16, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1807,7 +1946,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r4.2xlarge", MemoryGB: 61, - ECU: 27, + ECU: 31, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1817,7 +1956,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r4.4xlarge", MemoryGB: 122, - ECU: 53, + ECU: 58, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1827,7 +1966,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r4.8xlarge", MemoryGB: 244, - ECU: 99, + ECU: 97, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1848,7 +1987,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.large", MemoryGB: 16, - ECU: 9, + ECU: 10, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -1868,7 +2007,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.2xlarge", MemoryGB: 64, - ECU: 38, + ECU: 37, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -1878,7 +2017,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.4xlarge", MemoryGB: 128, - ECU: 71, + ECU: 70, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1888,7 +2027,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.8xlarge", MemoryGB: 256, - ECU: 131, + ECU: 128, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1898,7 +2037,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.12xlarge", MemoryGB: 384, - ECU: 173, + ECU: 168, Cores: 48, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -1908,7 +2047,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.16xlarge", MemoryGB: 512, - ECU: 262, + ECU: 256, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -1918,7 +2057,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5.24xlarge", MemoryGB: 768, - ECU: 347, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -2101,7 +2240,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.2xlarge", MemoryGB: 64, - ECU: 38, + ECU: 37, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -2111,7 +2250,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.4xlarge", MemoryGB: 128, - ECU: 71, + ECU: 70, Cores: 16, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -2121,7 +2260,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.8xlarge", MemoryGB: 256, - ECU: 131, + ECU: 128, Cores: 32, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -2131,7 +2270,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.12xlarge", MemoryGB: 384, - ECU: 173, + ECU: 168, Cores: 48, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -2141,7 +2280,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.16xlarge", MemoryGB: 512, - ECU: 262, + ECU: 256, Cores: 64, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -2151,7 +2290,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "r5d.24xlarge", MemoryGB: 768, - ECU: 347, + ECU: 337, Cores: 96, InstanceENIs: 15, InstanceIPsPerENI: 50, @@ -2662,7 +2801,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "z1d.large", MemoryGB: 16, - ECU: 15, + ECU: 12, Cores: 2, InstanceENIs: 3, InstanceIPsPerENI: 10, @@ -2672,7 +2811,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "z1d.xlarge", MemoryGB: 32, - ECU: 28, + ECU: 23, Cores: 4, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -2682,7 +2821,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "z1d.2xlarge", MemoryGB: 64, - ECU: 53, + ECU: 45, Cores: 8, InstanceENIs: 4, InstanceIPsPerENI: 15, @@ -2702,7 +2841,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "z1d.6xlarge", MemoryGB: 192, - ECU: 134, + ECU: 116, Cores: 24, InstanceENIs: 8, InstanceIPsPerENI: 30, @@ -2712,7 +2851,7 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ { Name: "z1d.12xlarge", MemoryGB: 384, - ECU: 271, + ECU: 235, Cores: 48, InstanceENIs: 15, InstanceIPsPerENI: 50,