diff --git a/hack/machine_types/vpc_ip_resource_limit.go b/hack/machine_types/vpc_ip_resource_limit.go index 2ee78d224b..6198b03efc 100644 --- a/hack/machine_types/vpc_ip_resource_limit.go +++ b/hack/machine_types/vpc_ip_resource_limit.go @@ -32,455 +32,527 @@ package main // InstanceENIsAvailable contains a mapping of instance types to the number of ENIs available which is described at // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI var InstanceENIsAvailable = map[string]int{ - "a1.medium": 2, - "a1.large": 3, - "a1.xlarge": 4, "a1.2xlarge": 4, "a1.4xlarge": 8, + "a1.large": 3, + "a1.medium": 2, + "a1.metal": 8, + "a1.xlarge": 4, "c1.medium": 2, "c1.xlarge": 4, - "c3.large": 3, - "c3.xlarge": 4, "c3.2xlarge": 4, "c3.4xlarge": 8, "c3.8xlarge": 8, - "c4.large": 3, - "c4.xlarge": 4, + "c3.large": 3, + "c3.xlarge": 4, "c4.2xlarge": 4, "c4.4xlarge": 8, "c4.8xlarge": 8, - "c5.large": 3, - "c5.xlarge": 4, - "c5.2xlarge": 4, - "c5.4xlarge": 8, - "c5.9xlarge": 8, + "c4.large": 3, + "c4.xlarge": 4, "c5.12xlarge": 8, "c5.18xlarge": 15, "c5.24xlarge": 15, + "c5.2xlarge": 4, + "c5.4xlarge": 8, + "c5.9xlarge": 8, + "c5.large": 3, "c5.metal": 15, - "c5d.large": 3, - "c5d.xlarge": 4, + "c5.xlarge": 4, + "c5d.12xlarge": 8, + "c5d.18xlarge": 15, + "c5d.24xlarge": 15, "c5d.2xlarge": 4, "c5d.4xlarge": 8, "c5d.9xlarge": 8, - "c5d.18xlarge": 15, - "c5n.large": 3, - "c5n.xlarge": 4, + "c5d.large": 3, + "c5d.metal": 15, + "c5d.xlarge": 4, + "c5n.18xlarge": 15, "c5n.2xlarge": 4, "c5n.4xlarge": 8, "c5n.9xlarge": 8, - "c5n.18xlarge": 15, + "c5n.large": 3, "c5n.metal": 15, + "c5n.xlarge": 4, "cc2.8xlarge": 8, "cr1.8xlarge": 8, - "d2.xlarge": 4, "d2.2xlarge": 4, "d2.4xlarge": 8, "d2.8xlarge": 8, + "d2.xlarge": 4, + "f1.16xlarge": 8, "f1.2xlarge": 4, "f1.4xlarge": 8, - "f1.16xlarge": 8, "g2.2xlarge": 4, "g2.8xlarge": 8, - "g3s.xlarge": 4, + "g3.16xlarge": 15, "g3.4xlarge": 8, "g3.8xlarge": 8, - "g3.16xlarge": 15, - "g4dn.xlarge": 3, + "g3s.xlarge": 4, + "g4dn.12xlarge": 8, + "g4dn.16xlarge": 15, "g4dn.2xlarge": 3, "g4dn.4xlarge": 3, "g4dn.8xlarge": 4, - "g4dn.12xlarge": 8, - "g4dn.16xlarge": 15, + "g4dn.xlarge": 3, + "h1.16xlarge": 15, "h1.2xlarge": 4, "h1.4xlarge": 8, "h1.8xlarge": 8, - "h1.16xlarge": 15, "hs1.8xlarge": 8, - "i2.xlarge": 4, "i2.2xlarge": 4, "i2.4xlarge": 8, "i2.8xlarge": 8, - "i3.large": 3, - "i3.xlarge": 4, + "i2.xlarge": 4, + "i3.16xlarge": 15, "i3.2xlarge": 4, "i3.4xlarge": 8, "i3.8xlarge": 8, - "i3.16xlarge": 15, + "i3.large": 3, "i3.metal": 15, - "i3en.large": 3, - "i3en.xlarge": 4, + "i3.xlarge": 4, + "i3en.12xlarge": 8, + "i3en.24xlarge": 15, "i3en.2xlarge": 4, "i3en.3xlarge": 4, "i3en.6xlarge": 8, - "i3en.12xlarge": 8, - "i3en.24xlarge": 15, + "i3en.large": 3, "i3en.metal": 15, - "m1.small": 2, - "m1.medium": 2, + "i3en.xlarge": 4, "m1.large": 3, + "m1.medium": 2, + "m1.small": 2, "m1.xlarge": 4, - "m2.xlarge": 4, "m2.2xlarge": 4, "m2.4xlarge": 8, - "m3.medium": 2, - "m3.large": 3, - "m3.xlarge": 4, + "m2.xlarge": 4, "m3.2xlarge": 4, - "m4.large": 2, - "m4.xlarge": 4, - "m4.2xlarge": 4, - "m4.4xlarge": 8, + "m3.large": 3, + "m3.medium": 2, + "m3.xlarge": 4, "m4.10xlarge": 8, "m4.16xlarge": 8, - "m5.large": 3, - "m5.xlarge": 4, - "m5.2xlarge": 4, - "m5.4xlarge": 8, - "m5.8xlarge": 8, + "m4.2xlarge": 4, + "m4.4xlarge": 8, + "m4.large": 2, + "m4.xlarge": 4, "m5.12xlarge": 8, "m5.16xlarge": 15, "m5.24xlarge": 15, + "m5.2xlarge": 4, + "m5.4xlarge": 8, + "m5.8xlarge": 8, + "m5.large": 3, "m5.metal": 15, - "m5a.large": 3, - "m5a.xlarge": 4, - "m5a.2xlarge": 4, - "m5a.4xlarge": 8, - "m5a.8xlarge": 8, + "m5.xlarge": 4, "m5a.12xlarge": 8, "m5a.16xlarge": 15, "m5a.24xlarge": 15, - "m5d.large": 3, - "m5d.xlarge": 4, - "m5d.2xlarge": 4, - "m5d.4xlarge": 8, - "m5d.8xlarge": 8, + "m5a.2xlarge": 4, + "m5a.4xlarge": 8, + "m5a.8xlarge": 8, + "m5a.large": 3, + "m5a.xlarge": 4, + "m5ad.12xlarge": 8, + "m5ad.24xlarge": 15, + "m5ad.2xlarge": 4, + "m5ad.4xlarge": 8, + "m5ad.large": 3, + "m5ad.xlarge": 4, "m5d.12xlarge": 8, "m5d.16xlarge": 15, "m5d.24xlarge": 15, + "m5d.2xlarge": 4, + "m5d.4xlarge": 8, + "m5d.8xlarge": 8, + "m5d.large": 3, "m5d.metal": 15, - "m5ad.12xlarge": 8, - "m5ad.xlarge": 4, - "r5ad.large": 3, - "m5ad.4xlarge": 8, - "m5ad.large": 3, - "r5ad.24xlarge": 15, - "r5ad.12xlarge": 8, - "m5ad.24xlarge": 15, - "r5ad.2xlarge": 4, - "m5ad.2xlarge": 4, - "r5ad.xlarge": 4, - "r5ad.4xlarge": 8, - "p2.xlarge": 4, - "p2.8xlarge": 8, + "m5d.xlarge": 4, + "m5dn.12xlarge": 8, + "m5dn.16xlarge": 15, + "m5dn.24xlarge": 15, + "m5dn.2xlarge": 4, + "m5dn.4xlarge": 8, + "m5dn.8xlarge": 8, + "m5dn.large": 3, + "m5dn.xlarge": 4, + "m5n.12xlarge": 8, + "m5n.16xlarge": 15, + "m5n.24xlarge": 15, + "m5n.2xlarge": 4, + "m5n.4xlarge": 8, + "m5n.8xlarge": 8, + "m5n.large": 3, + "m5n.xlarge": 4, "p2.16xlarge": 8, + "p2.8xlarge": 8, + "p2.xlarge": 4, + "p3.16xlarge": 8, "p3.2xlarge": 4, "p3.8xlarge": 8, - "p3.16xlarge": 8, "p3dn.24xlarge": 15, - "r3.large": 3, - "r3.xlarge": 4, "r3.2xlarge": 4, "r3.4xlarge": 8, "r3.8xlarge": 8, - "r4.large": 3, - "r4.xlarge": 4, + "r3.large": 3, + "r3.xlarge": 4, + "r4.16xlarge": 15, "r4.2xlarge": 4, "r4.4xlarge": 8, "r4.8xlarge": 8, - "r4.16xlarge": 15, - "r5.large": 3, - "r5.xlarge": 4, - "r5.2xlarge": 4, - "r5.4xlarge": 8, - "r5.8xlarge": 8, + "r4.large": 3, + "r4.xlarge": 4, "r5.12xlarge": 8, "r5.16xlarge": 15, "r5.24xlarge": 15, + "r5.2xlarge": 4, + "r5.4xlarge": 8, + "r5.8xlarge": 8, + "r5.large": 3, "r5.metal": 15, - "r5a.large": 3, - "r5a.xlarge": 4, - "r5a.2xlarge": 4, - "r5a.4xlarge": 8, - "r5a.8xlarge": 8, + "r5.xlarge": 4, "r5a.12xlarge": 8, "r5a.16xlarge": 15, "r5a.24xlarge": 15, - "r5d.large": 3, - "r5d.xlarge": 4, - "r5d.2xlarge": 4, - "r5d.4xlarge": 8, - "r5d.8xlarge": 8, + "r5a.2xlarge": 4, + "r5a.4xlarge": 8, + "r5a.8xlarge": 8, + "r5a.large": 3, + "r5a.xlarge": 4, + "r5ad.12xlarge": 8, + "r5ad.24xlarge": 15, + "r5ad.2xlarge": 4, + "r5ad.4xlarge": 8, + "r5ad.large": 3, + "r5ad.xlarge": 4, "r5d.12xlarge": 8, "r5d.16xlarge": 15, "r5d.24xlarge": 15, + "r5d.2xlarge": 4, + "r5d.4xlarge": 8, + "r5d.8xlarge": 8, + "r5d.large": 3, "r5d.metal": 15, + "r5d.xlarge": 4, + "r5dn.12xlarge": 8, + "r5dn.16xlarge": 15, + "r5dn.24xlarge": 15, + "r5dn.2xlarge": 4, + "r5dn.4xlarge": 8, + "r5dn.8xlarge": 8, + "r5dn.large": 3, + "r5dn.xlarge": 4, + "r5n.12xlarge": 8, + "r5n.16xlarge": 15, + "r5n.24xlarge": 15, + "r5n.2xlarge": 4, + "r5n.4xlarge": 8, + "r5n.8xlarge": 8, + "r5n.large": 3, + "r5n.xlarge": 4, "t1.micro": 2, - "t2.nano": 2, - "t2.micro": 2, - "t2.small": 3, - "t2.medium": 3, - "t2.large": 3, - "t2.xlarge": 3, "t2.2xlarge": 3, - "t3.nano": 2, - "t3.micro": 2, - "t3.small": 3, - "t3.medium": 3, - "t3.large": 3, - "t3.xlarge": 4, + "t2.large": 3, + "t2.medium": 3, + "t2.micro": 2, + "t2.nano": 2, + "t2.small": 3, + "t2.xlarge": 3, "t3.2xlarge": 4, - "t3a.nano": 2, - "t3a.micro": 2, - "t3a.small": 3, - "t3a.medium": 3, - "t3a.large": 3, - "t3a.xlarge": 4, + "t3.large": 3, + "t3.medium": 3, + "t3.micro": 2, + "t3.nano": 2, + "t3.small": 3, + "t3.xlarge": 4, "t3a.2xlarge": 4, + "t3a.large": 3, + "t3a.medium": 3, + "t3a.micro": 2, + "t3a.nano": 2, + "t3a.small": 3, + "t3a.xlarge": 4, + "u-12tb1.metal": 5, "u-6tb1.metal": 5, "u-9tb1.metal": 5, - "u-12tb1.metal": 5, "x1.16xlarge": 8, "x1.32xlarge": 8, - "x1e.xlarge": 3, + "x1e.16xlarge": 8, "x1e.2xlarge": 4, + "x1e.32xlarge": 8, "x1e.4xlarge": 4, "x1e.8xlarge": 4, - "x1e.16xlarge": 8, - "x1e.32xlarge": 8, - "z1d.large": 3, - "z1d.xlarge": 4, + "x1e.xlarge": 3, + "z1d.12xlarge": 15, "z1d.2xlarge": 4, "z1d.3xlarge": 8, "z1d.6xlarge": 8, - "z1d.12xlarge": 15, + "z1d.large": 3, "z1d.metal": 15, + "z1d.xlarge": 4, } // InstanceIPsAvailable contains a mapping of instance types to the number of IPs per ENI // https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI var InstanceIPsAvailable = map[string]int64{ - "a1.medium": 4, - "a1.large": 10, - "a1.xlarge": 15, "a1.2xlarge": 15, "a1.4xlarge": 30, + "a1.large": 10, + "a1.medium": 4, + "a1.metal": 30, + "a1.xlarge": 15, "c1.medium": 6, "c1.xlarge": 15, - "c3.large": 10, - "c3.xlarge": 15, "c3.2xlarge": 15, "c3.4xlarge": 30, "c3.8xlarge": 30, - "c4.large": 10, - "c4.xlarge": 15, + "c3.large": 10, + "c3.xlarge": 15, "c4.2xlarge": 15, "c4.4xlarge": 30, "c4.8xlarge": 30, - "c5.large": 10, - "c5.xlarge": 15, - "c5.2xlarge": 15, - "c5.4xlarge": 30, - "c5.9xlarge": 30, + "c4.large": 10, + "c4.xlarge": 15, "c5.12xlarge": 30, "c5.18xlarge": 50, "c5.24xlarge": 50, + "c5.2xlarge": 15, + "c5.4xlarge": 30, + "c5.9xlarge": 30, + "c5.large": 10, "c5.metal": 50, - "c5d.large": 10, - "c5d.xlarge": 15, + "c5.xlarge": 15, + "c5d.12xlarge": 30, + "c5d.18xlarge": 50, + "c5d.24xlarge": 50, "c5d.2xlarge": 15, "c5d.4xlarge": 30, "c5d.9xlarge": 30, - "c5d.18xlarge": 50, - "c5n.large": 10, - "c5n.xlarge": 15, + "c5d.large": 10, + "c5d.metal": 50, + "c5d.xlarge": 15, + "c5n.18xlarge": 50, "c5n.2xlarge": 15, "c5n.4xlarge": 30, "c5n.9xlarge": 30, - "c5n.18xlarge": 50, + "c5n.large": 10, "c5n.metal": 50, + "c5n.xlarge": 15, "cc2.8xlarge": 30, "cr1.8xlarge": 30, - "d2.xlarge": 15, "d2.2xlarge": 15, "d2.4xlarge": 30, "d2.8xlarge": 30, + "d2.xlarge": 15, + "f1.16xlarge": 50, "f1.2xlarge": 15, "f1.4xlarge": 30, - "f1.16xlarge": 50, "g2.2xlarge": 15, "g2.8xlarge": 30, - "g3s.xlarge": 15, + "g3.16xlarge": 50, "g3.4xlarge": 30, "g3.8xlarge": 30, - "g3.16xlarge": 50, - "g4dn.xlarge": 10, + "g3s.xlarge": 15, + "g4dn.12xlarge": 30, + "g4dn.16xlarge": 50, "g4dn.2xlarge": 10, "g4dn.4xlarge": 10, "g4dn.8xlarge": 15, - "g4dn.12xlarge": 30, - "g4dn.16xlarge": 50, + "g4dn.xlarge": 10, + "h1.16xlarge": 50, "h1.2xlarge": 15, "h1.4xlarge": 30, "h1.8xlarge": 30, - "h1.16xlarge": 50, "hs1.8xlarge": 30, - "i2.xlarge": 15, "i2.2xlarge": 15, "i2.4xlarge": 30, "i2.8xlarge": 30, - "i3.large": 10, - "i3.xlarge": 15, + "i2.xlarge": 15, + "i3.16xlarge": 50, "i3.2xlarge": 15, "i3.4xlarge": 30, "i3.8xlarge": 30, - "i3.16xlarge": 50, + "i3.large": 10, "i3.metal": 50, - "i3en.large": 10, - "i3en.xlarge": 15, + "i3.xlarge": 15, + "i3en.12xlarge": 30, + "i3en.24xlarge": 50, "i3en.2xlarge": 15, "i3en.3xlarge": 15, "i3en.6xlarge": 30, - "i3en.12xlarge": 30, - "i3en.24xlarge": 50, + "i3en.large": 10, "i3en.metal": 50, - "m1.small": 4, - "m1.medium": 6, + "i3en.xlarge": 15, "m1.large": 10, + "m1.medium": 6, + "m1.small": 4, "m1.xlarge": 15, - "m2.xlarge": 15, "m2.2xlarge": 30, "m2.4xlarge": 30, - "m3.medium": 6, - "m3.large": 10, - "m3.xlarge": 15, + "m2.xlarge": 15, "m3.2xlarge": 30, - "m4.large": 10, - "m4.xlarge": 15, - "m4.2xlarge": 15, - "m4.4xlarge": 30, + "m3.large": 10, + "m3.medium": 6, + "m3.xlarge": 15, "m4.10xlarge": 30, "m4.16xlarge": 30, - "m5.large": 10, - "m5.xlarge": 15, - "m5.2xlarge": 15, - "m5.4xlarge": 30, - "m5.8xlarge": 30, + "m4.2xlarge": 15, + "m4.4xlarge": 30, + "m4.large": 10, + "m4.xlarge": 15, "m5.12xlarge": 30, "m5.16xlarge": 30, "m5.24xlarge": 50, + "m5.2xlarge": 15, + "m5.4xlarge": 30, + "m5.8xlarge": 30, + "m5.large": 10, "m5.metal": 50, - "m5a.large": 10, - "m5a.xlarge": 15, - "m5a.2xlarge": 15, - "m5a.4xlarge": 30, - "m5a.8xlarge": 30, + "m5.xlarge": 15, "m5a.12xlarge": 30, "m5a.16xlarge": 30, "m5a.24xlarge": 50, - "m5d.large": 10, - "m5d.xlarge": 15, - "m5d.2xlarge": 15, - "m5d.4xlarge": 30, - "m5d.8xlarge": 30, + "m5a.2xlarge": 15, + "m5a.4xlarge": 30, + "m5a.8xlarge": 30, + "m5a.large": 10, + "m5a.xlarge": 15, + "m5ad.12xlarge": 30, + "m5ad.24xlarge": 50, + "m5ad.2xlarge": 15, + "m5ad.4xlarge": 30, + "m5ad.large": 10, + "m5ad.xlarge": 15, "m5d.12xlarge": 30, "m5d.16xlarge": 30, "m5d.24xlarge": 50, + "m5d.2xlarge": 15, + "m5d.4xlarge": 30, + "m5d.8xlarge": 30, + "m5d.large": 10, "m5d.metal": 50, - "m5ad.12xlarge": 30, - "m5ad.xlarge": 15, - "r5ad.large": 10, - "m5ad.4xlarge": 30, - "m5ad.large": 10, - "r5ad.24xlarge": 50, - "r5ad.12xlarge": 30, - "m5ad.24xlarge": 50, - "r5ad.2xlarge": 15, - "m5ad.2xlarge": 15, - "r5ad.xlarge": 15, - "r5ad.4xlarge": 30, - "p2.xlarge": 15, - "p2.8xlarge": 30, + "m5d.xlarge": 15, + "m5dn.12xlarge": 30, + "m5dn.16xlarge": 50, + "m5dn.24xlarge": 50, + "m5dn.2xlarge": 15, + "m5dn.4xlarge": 30, + "m5dn.8xlarge": 30, + "m5dn.large": 10, + "m5dn.xlarge": 15, + "m5n.12xlarge": 30, + "m5n.16xlarge": 50, + "m5n.24xlarge": 50, + "m5n.2xlarge": 15, + "m5n.4xlarge": 30, + "m5n.8xlarge": 30, + "m5n.large": 10, + "m5n.xlarge": 15, "p2.16xlarge": 30, + "p2.8xlarge": 30, + "p2.xlarge": 15, + "p3.16xlarge": 30, "p3.2xlarge": 15, "p3.8xlarge": 30, - "p3.16xlarge": 30, "p3dn.24xlarge": 50, - "r3.large": 10, - "r3.xlarge": 15, "r3.2xlarge": 15, "r3.4xlarge": 30, "r3.8xlarge": 30, - "r4.large": 10, - "r4.xlarge": 15, + "r3.large": 10, + "r3.xlarge": 15, + "r4.16xlarge": 50, "r4.2xlarge": 15, "r4.4xlarge": 30, "r4.8xlarge": 30, - "r4.16xlarge": 50, - "r5.large": 10, - "r5.xlarge": 15, - "r5.2xlarge": 15, - "r5.4xlarge": 30, - "r5.8xlarge": 30, + "r4.large": 10, + "r4.xlarge": 15, "r5.12xlarge": 30, "r5.16xlarge": 50, "r5.24xlarge": 50, + "r5.2xlarge": 15, + "r5.4xlarge": 30, + "r5.8xlarge": 30, + "r5.large": 10, "r5.metal": 50, - "r5a.large": 10, - "r5a.xlarge": 15, - "r5a.2xlarge": 15, - "r5a.4xlarge": 30, - "r5a.8xlarge": 30, + "r5.xlarge": 15, "r5a.12xlarge": 30, "r5a.16xlarge": 50, "r5a.24xlarge": 50, - "r5d.large": 10, - "r5d.xlarge": 15, - "r5d.2xlarge": 15, - "r5d.4xlarge": 30, - "r5d.8xlarge": 30, + "r5a.2xlarge": 15, + "r5a.4xlarge": 30, + "r5a.8xlarge": 30, + "r5a.large": 10, + "r5a.xlarge": 15, + "r5ad.12xlarge": 30, + "r5ad.24xlarge": 50, + "r5ad.2xlarge": 15, + "r5ad.4xlarge": 30, + "r5ad.large": 10, + "r5ad.xlarge": 15, "r5d.12xlarge": 30, "r5d.16xlarge": 50, "r5d.24xlarge": 50, + "r5d.2xlarge": 15, + "r5d.4xlarge": 30, + "r5d.8xlarge": 30, + "r5d.large": 10, "r5d.metal": 50, + "r5d.xlarge": 15, + "r5dn.12xlarge": 30, + "r5dn.16xlarge": 50, + "r5dn.24xlarge": 50, + "r5dn.2xlarge": 15, + "r5dn.4xlarge": 30, + "r5dn.8xlarge": 30, + "r5dn.large": 10, + "r5dn.xlarge": 15, + "r5n.12xlarge": 30, + "r5n.16xlarge": 50, + "r5n.24xlarge": 50, + "r5n.2xlarge": 15, + "r5n.4xlarge": 30, + "r5n.8xlarge": 30, + "r5n.large": 10, + "r5n.xlarge": 15, "t1.micro": 2, - "t2.nano": 2, - "t2.micro": 2, - "t2.small": 4, - "t2.medium": 6, - "t2.large": 12, - "t2.xlarge": 15, "t2.2xlarge": 15, - "t3.nano": 2, - "t3.micro": 2, - "t3.small": 4, - "t3.medium": 6, - "t3.large": 12, - "t3.xlarge": 15, + "t2.large": 12, + "t2.medium": 6, + "t2.micro": 2, + "t2.nano": 2, + "t2.small": 4, + "t2.xlarge": 15, "t3.2xlarge": 15, - "t3a.nano": 2, - "t3a.micro": 2, - "t3a.small": 4, - "t3a.medium": 6, - "t3a.large": 12, - "t3a.xlarge": 15, + "t3.large": 12, + "t3.medium": 6, + "t3.micro": 2, + "t3.nano": 2, + "t3.small": 4, + "t3.xlarge": 15, "t3a.2xlarge": 15, + "t3a.large": 12, + "t3a.medium": 6, + "t3a.micro": 2, + "t3a.nano": 2, + "t3a.small": 4, + "t3a.xlarge": 15, + "u-12tb1.metal": 30, "u-6tb1.metal": 30, "u-9tb1.metal": 30, - "u-12tb1.metal": 30, "x1.16xlarge": 30, "x1.32xlarge": 30, - "x1e.xlarge": 10, + "x1e.16xlarge": 30, "x1e.2xlarge": 15, + "x1e.32xlarge": 30, "x1e.4xlarge": 15, "x1e.8xlarge": 15, - "x1e.16xlarge": 30, - "x1e.32xlarge": 30, - "z1d.large": 10, - "z1d.xlarge": 15, + "x1e.xlarge": 10, + "z1d.12xlarge": 50, "z1d.2xlarge": 15, "z1d.3xlarge": 30, "z1d.6xlarge": 30, - "z1d.12xlarge": 50, + "z1d.large": 10, "z1d.metal": 50, + "z1d.xlarge": 15, } diff --git a/upup/pkg/fi/cloudup/awsup/machine_types.go b/upup/pkg/fi/cloudup/awsup/machine_types.go index 9b50011575..93919a6191 100644 --- a/upup/pkg/fi/cloudup/awsup/machine_types.go +++ b/upup/pkg/fi/cloudup/awsup/machine_types.go @@ -131,6 +131,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: nil, }, + { + Name: "a1.metal", + MemoryGB: 32, + ECU: 0, + Cores: 16, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + // c1 family { Name: "c1.medium", @@ -396,6 +406,16 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: []int{900}, }, + { + Name: "c5d.12xlarge", + MemoryGB: 96, + ECU: 188, + Cores: 48, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{900, 900}, + }, + { Name: "c5d.18xlarge", MemoryGB: 144, @@ -406,6 +426,26 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: []int{900, 900}, }, + { + Name: "c5d.24xlarge", + MemoryGB: 192, + ECU: 375, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{900, 900, 900, 900}, + }, + + { + Name: "c5d.metal", + MemoryGB: 192, + ECU: 375, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{900, 900, 900, 900}, + }, + // c5n family { Name: "c5n.large", @@ -1450,6 +1490,168 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: []int{900, 900, 900, 900}, }, + // m5dn family + { + Name: "m5dn.large", + MemoryGB: 8, + ECU: 0, + Cores: 2, + InstanceENIs: 3, + InstanceIPsPerENI: 10, + EphemeralDisks: []int{75}, + }, + + { + Name: "m5dn.xlarge", + MemoryGB: 16, + ECU: 0, + Cores: 4, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: []int{150}, + }, + + { + Name: "m5dn.2xlarge", + MemoryGB: 32, + ECU: 0, + Cores: 8, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: []int{300}, + }, + + { + Name: "m5dn.4xlarge", + MemoryGB: 64, + ECU: 0, + Cores: 16, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{300, 300}, + }, + + { + Name: "m5dn.8xlarge", + MemoryGB: 128, + ECU: 0, + Cores: 32, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{600, 600}, + }, + + { + Name: "m5dn.12xlarge", + MemoryGB: 192, + ECU: 0, + Cores: 48, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{900, 900}, + }, + + { + Name: "m5dn.16xlarge", + MemoryGB: 256, + ECU: 0, + Cores: 64, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{600, 600, 600, 600}, + }, + + { + Name: "m5dn.24xlarge", + MemoryGB: 384, + ECU: 0, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{900, 900, 900, 900}, + }, + + // m5n family + { + Name: "m5n.large", + MemoryGB: 8, + ECU: 0, + Cores: 2, + InstanceENIs: 3, + InstanceIPsPerENI: 10, + EphemeralDisks: nil, + }, + + { + Name: "m5n.xlarge", + MemoryGB: 16, + ECU: 0, + Cores: 4, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: nil, + }, + + { + Name: "m5n.2xlarge", + MemoryGB: 32, + ECU: 0, + Cores: 8, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: nil, + }, + + { + Name: "m5n.4xlarge", + MemoryGB: 64, + ECU: 0, + Cores: 16, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "m5n.8xlarge", + MemoryGB: 128, + ECU: 0, + Cores: 32, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "m5n.12xlarge", + MemoryGB: 192, + ECU: 0, + Cores: 48, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "m5n.16xlarge", + MemoryGB: 256, + ECU: 0, + Cores: 64, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: nil, + }, + + { + Name: "m5n.24xlarge", + MemoryGB: 384, + ECU: 0, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: nil, + }, + // p2 family { Name: "p2.xlarge", @@ -1966,6 +2168,168 @@ var MachineTypes []AWSMachineTypeInfo = []AWSMachineTypeInfo{ EphemeralDisks: []int{900, 900, 900, 900}, }, + // r5dn family + { + Name: "r5dn.large", + MemoryGB: 16, + ECU: 0, + Cores: 2, + InstanceENIs: 3, + InstanceIPsPerENI: 10, + EphemeralDisks: []int{75}, + }, + + { + Name: "r5dn.xlarge", + MemoryGB: 32, + ECU: 0, + Cores: 4, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: []int{150}, + }, + + { + Name: "r5dn.2xlarge", + MemoryGB: 64, + ECU: 0, + Cores: 8, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: []int{300}, + }, + + { + Name: "r5dn.4xlarge", + MemoryGB: 128, + ECU: 0, + Cores: 16, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{300, 300}, + }, + + { + Name: "r5dn.8xlarge", + MemoryGB: 256, + ECU: 0, + Cores: 32, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{600, 600}, + }, + + { + Name: "r5dn.12xlarge", + MemoryGB: 384, + ECU: 0, + Cores: 48, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: []int{900, 900}, + }, + + { + Name: "r5dn.16xlarge", + MemoryGB: 512, + ECU: 0, + Cores: 64, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{600, 600, 600, 600}, + }, + + { + Name: "r5dn.24xlarge", + MemoryGB: 768, + ECU: 0, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: []int{900, 900, 900, 900}, + }, + + // r5n family + { + Name: "r5n.large", + MemoryGB: 16, + ECU: 0, + Cores: 2, + InstanceENIs: 3, + InstanceIPsPerENI: 10, + EphemeralDisks: nil, + }, + + { + Name: "r5n.xlarge", + MemoryGB: 32, + ECU: 0, + Cores: 4, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: nil, + }, + + { + Name: "r5n.2xlarge", + MemoryGB: 64, + ECU: 0, + Cores: 8, + InstanceENIs: 4, + InstanceIPsPerENI: 15, + EphemeralDisks: nil, + }, + + { + Name: "r5n.4xlarge", + MemoryGB: 128, + ECU: 0, + Cores: 16, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "r5n.8xlarge", + MemoryGB: 256, + ECU: 0, + Cores: 32, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "r5n.12xlarge", + MemoryGB: 384, + ECU: 0, + Cores: 48, + InstanceENIs: 8, + InstanceIPsPerENI: 30, + EphemeralDisks: nil, + }, + + { + Name: "r5n.16xlarge", + MemoryGB: 512, + ECU: 0, + Cores: 64, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: nil, + }, + + { + Name: "r5n.24xlarge", + MemoryGB: 768, + ECU: 0, + Cores: 96, + InstanceENIs: 15, + InstanceIPsPerENI: 50, + EphemeralDisks: nil, + }, + // t1 family { Name: "t1.micro",