From d2da5a0598f84fe6534286d1c98b6a6746b10aa3 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Fri, 18 Oct 2024 18:36:57 +0000 Subject: [PATCH] Update Limits and Add New Instance Types. --- misc/eni-max-pods.txt | 64 ++ pkg/vpc/vpc_ip_resource_limit.go | 1406 ++++++++++++++++++++++++++---- 2 files changed, 1296 insertions(+), 174 deletions(-) diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt index 2ce0e5884d..92a8fcbcfe 100644 --- a/misc/eni-max-pods.txt +++ b/misc/eni-max-pods.txt @@ -38,6 +38,8 @@ # # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI # +# NOTE: For multi-card instance types (p5.48xlarge) the max limits is calculated only against the default network card at index (0). +# a1.2xlarge 58 a1.4xlarge 234 a1.large 29 @@ -222,6 +224,18 @@ c7i.large 29 c7i.metal-24xl 737 c7i.metal-48xl 737 c7i.xlarge 58 +c8g.12xlarge 234 +c8g.16xlarge 737 +c8g.24xlarge 737 +c8g.2xlarge 58 +c8g.48xlarge 737 +c8g.4xlarge 234 +c8g.8xlarge 234 +c8g.large 29 +c8g.medium 8 +c8g.metal-24xl 737 +c8g.metal-48xl 737 +c8g.xlarge 58 cr1.8xlarge 234 d2.2xlarge 58 d2.4xlarge 234 @@ -280,6 +294,14 @@ g6.48xlarge 737 g6.4xlarge 234 g6.8xlarge 234 g6.xlarge 58 +g6e.12xlarge 292 +g6e.16xlarge 737 +g6e.24xlarge 492 +g6e.2xlarge 58 +g6e.48xlarge 492 +g6e.4xlarge 234 +g6e.8xlarge 234 +g6e.xlarge 58 gr6.4xlarge 234 gr6.8xlarge 234 h1.16xlarge 394 @@ -542,7 +564,20 @@ m7i.large 29 m7i.metal-24xl 737 m7i.metal-48xl 737 m7i.xlarge 58 +m8g.12xlarge 234 +m8g.16xlarge 737 +m8g.24xlarge 737 +m8g.2xlarge 58 +m8g.48xlarge 737 +m8g.4xlarge 234 +m8g.8xlarge 234 +m8g.large 29 +m8g.medium 8 +m8g.metal-24xl 737 +m8g.metal-48xl 737 +m8g.xlarge 58 mac1.metal 234 +mac2-m1ultra.metal 234 mac2-m2.metal 234 mac2-m2pro.metal 234 mac2.metal 234 @@ -556,6 +591,7 @@ p3dn.24xlarge 737 p4d.24xlarge 737 p4de.24xlarge 737 p5.48xlarge 100 +p5e.48xlarge 100 r3.2xlarge 58 r3.4xlarge 234 r3.8xlarge 234 @@ -748,6 +784,18 @@ r7iz.large 29 r7iz.metal-16xl 737 r7iz.metal-32xl 737 r7iz.xlarge 58 +r8g.12xlarge 234 +r8g.16xlarge 737 +r8g.24xlarge 737 +r8g.2xlarge 58 +r8g.48xlarge 737 +r8g.4xlarge 234 +r8g.8xlarge 234 +r8g.large 29 +r8g.medium 8 +r8g.metal-24xl 737 +r8g.metal-48xl 737 +r8g.xlarge 58 t1.micro 4 t2.2xlarge 44 t2.large 35 @@ -792,6 +840,10 @@ u-6tb1.56xlarge 737 u-6tb1.metal 147 u-9tb1.112xlarge 737 u-9tb1.metal 147 +u7i-12tb.224xlarge 737 +u7in-16tb.224xlarge 394 +u7in-24tb.224xlarge 394 +u7in-32tb.224xlarge 394 vt1.24xlarge 737 vt1.3xlarge 58 vt1.6xlarge 234 @@ -830,6 +882,18 @@ x2iezn.4xlarge 234 x2iezn.6xlarge 234 x2iezn.8xlarge 234 x2iezn.metal 737 +x8g.12xlarge 234 +x8g.16xlarge 737 +x8g.24xlarge 737 +x8g.2xlarge 58 +x8g.48xlarge 737 +x8g.4xlarge 234 +x8g.8xlarge 234 +x8g.large 29 +x8g.medium 8 +x8g.metal-24xl 737 +x8g.metal-48xl 737 +x8g.xlarge 58 z1d.12xlarge 737 z1d.2xlarge 58 z1d.3xlarge 234 diff --git a/pkg/vpc/vpc_ip_resource_limit.go b/pkg/vpc/vpc_ip_resource_limit.go index efb6a8b77d..86a56659fc 100644 --- a/pkg/vpc/vpc_ip_resource_limit.go +++ b/pkg/vpc/vpc_ip_resource_limit.go @@ -2602,6 +2602,174 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, + "c8g.12xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.48xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.4xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.large": { + ENILimit: 3, + IPv4Limit: 10, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 3, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.medium": { + ENILimit: 2, + IPv4Limit: 4, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "c8g.metal-24xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "c8g.metal-48xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "c8g.xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, "cr1.8xlarge": { ENILimit: 8, IPv4Limit: 30, @@ -3424,13 +3592,13 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "gr6.4xlarge": { - ENILimit: 8, + "g6e.12xlarge": { + ENILimit: 10, IPv4Limit: 30, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 10, NetworkCardIndex: 0, }, @@ -3438,13 +3606,13 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "gr6.8xlarge": { - ENILimit: 8, - IPv4Limit: 30, + "g6e.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 15, NetworkCardIndex: 0, }, @@ -3452,21 +3620,26 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "h1.16xlarge": { - ENILimit: 8, + "g6e.24xlarge": { + ENILimit: 10, IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 10, NetworkCardIndex: 0, }, + { + MaximumNetworkInterfaces: 10, + NetworkCardIndex: 1, + }, + }, - HypervisorType: "xen", + HypervisorType: "nitro", IsBareMetal: false, }, - "h1.2xlarge": { + "g6e.2xlarge": { ENILimit: 4, IPv4Limit: 15, DefaultNetworkCardIndex: 0, @@ -3477,24 +3650,39 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ }, }, - HypervisorType: "xen", + HypervisorType: "nitro", IsBareMetal: false, }, - "h1.4xlarge": { - ENILimit: 8, - IPv4Limit: 30, + "g6e.48xlarge": { + ENILimit: 10, + IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 10, NetworkCardIndex: 0, }, + { + MaximumNetworkInterfaces: 10, + NetworkCardIndex: 1, + }, + + { + MaximumNetworkInterfaces: 10, + NetworkCardIndex: 2, + }, + + { + MaximumNetworkInterfaces: 10, + NetworkCardIndex: 3, + }, + }, - HypervisorType: "xen", + HypervisorType: "nitro", IsBareMetal: false, }, - "h1.8xlarge": { + "g6e.4xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -3505,16 +3693,16 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ }, }, - HypervisorType: "xen", + HypervisorType: "nitro", IsBareMetal: false, }, - "hpc6a.48xlarge": { - ENILimit: 2, - IPv4Limit: 50, + "g6e.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 2, + MaximumNetworkInterfaces: 8, NetworkCardIndex: 0, }, @@ -3522,78 +3710,190 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "hpc6id.32xlarge": { - ENILimit: 1, - IPv4Limit: 50, + "g6e.xlarge": { + ENILimit: 4, + IPv4Limit: 15, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 1, + MaximumNetworkInterfaces: 4, NetworkCardIndex: 0, }, - { - MaximumNetworkInterfaces: 1, - NetworkCardIndex: 1, - }, - }, HypervisorType: "nitro", IsBareMetal: false, }, - "hpc7a.12xlarge": { - ENILimit: 2, - IPv4Limit: 50, + "gr6.4xlarge": { + ENILimit: 8, + IPv4Limit: 30, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 2, + MaximumNetworkInterfaces: 8, NetworkCardIndex: 0, }, - { - MaximumNetworkInterfaces: 2, - NetworkCardIndex: 1, - }, - }, HypervisorType: "nitro", IsBareMetal: false, }, - "hpc7a.24xlarge": { - ENILimit: 2, - IPv4Limit: 50, + "gr6.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 2, + MaximumNetworkInterfaces: 8, NetworkCardIndex: 0, }, - { - MaximumNetworkInterfaces: 2, - NetworkCardIndex: 1, - }, - }, HypervisorType: "nitro", IsBareMetal: false, }, - "hpc7a.48xlarge": { - ENILimit: 2, + "h1.16xlarge": { + ENILimit: 8, IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 2, + MaximumNetworkInterfaces: 8, NetworkCardIndex: 0, }, - { - MaximumNetworkInterfaces: 2, - NetworkCardIndex: 1, - }, - + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "h1.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "h1.4xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "h1.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "hpc6a.48xlarge": { + ENILimit: 2, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "hpc6id.32xlarge": { + ENILimit: 1, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 1, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 1, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "hpc7a.12xlarge": { + ENILimit: 2, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "hpc7a.24xlarge": { + ENILimit: 2, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "hpc7a.48xlarge": { + ENILimit: 2, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 1, + }, + }, HypervisorType: "nitro", IsBareMetal: false, @@ -7132,7 +7432,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "mac1.metal": { + "m8g.12xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -7143,10 +7443,66 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ }, }, - HypervisorType: "unknown", - IsBareMetal: true, + HypervisorType: "nitro", + IsBareMetal: false, }, - "mac2-m2.metal": { + "m8g.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.48xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.4xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -7157,10 +7513,10 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ }, }, - HypervisorType: "unknown", - IsBareMetal: true, + HypervisorType: "nitro", + IsBareMetal: false, }, - "mac2-m2pro.metal": { + "m8g.8xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -7170,17 +7526,59 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ NetworkCardIndex: 0, }, + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.large": { + ENILimit: 3, + IPv4Limit: 10, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 3, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.medium": { + ENILimit: 2, + IPv4Limit: 4, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "m8g.metal-24xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + }, HypervisorType: "unknown", IsBareMetal: true, }, - "mac2.metal": { - ENILimit: 8, - IPv4Limit: 30, + "m8g.metal-48xl": { + ENILimit: 15, + IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 15, NetworkCardIndex: 0, }, @@ -7188,143 +7586,396 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "unknown", IsBareMetal: true, }, - "p2.16xlarge": { - ENILimit: 8, - IPv4Limit: 30, + "m8g.xlarge": { + ENILimit: 4, + IPv4Limit: 15, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 4, NetworkCardIndex: 0, }, }, - HypervisorType: "xen", + HypervisorType: "nitro", IsBareMetal: false, }, - "p2.8xlarge": { + "mac1.metal": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "mac2-m1ultra.metal": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "mac2-m2.metal": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "mac2-m2pro.metal": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "mac2.metal": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "p2.16xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p2.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p2.xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p3.16xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p3.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p3.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "xen", + IsBareMetal: false, + }, + "p3dn.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "p4d.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 1, + }, + + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 2, + }, + + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 3, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "p4de.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "p5.48xlarge": { + ENILimit: 2, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 1, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 2, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 3, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 4, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 5, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 6, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 7, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 8, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 9, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 10, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 11, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 12, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 13, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 14, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 15, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 16, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 17, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 18, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 19, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 20, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 21, + }, + + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 22, }, - }, - HypervisorType: "xen", - IsBareMetal: false, - }, - "p2.xlarge": { - ENILimit: 4, - IPv4Limit: 15, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 4, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 23, }, - }, - HypervisorType: "xen", - IsBareMetal: false, - }, - "p3.16xlarge": { - ENILimit: 8, - IPv4Limit: 30, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 24, }, - }, - HypervisorType: "xen", - IsBareMetal: false, - }, - "p3.2xlarge": { - ENILimit: 4, - IPv4Limit: 15, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 4, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 25, }, - }, - HypervisorType: "xen", - IsBareMetal: false, - }, - "p3.8xlarge": { - ENILimit: 8, - IPv4Limit: 30, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 26, }, - }, - HypervisorType: "xen", - IsBareMetal: false, - }, - "p3dn.24xlarge": { - ENILimit: 15, - IPv4Limit: 50, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 15, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 27, }, - }, - HypervisorType: "nitro", - IsBareMetal: false, - }, - "p4d.24xlarge": { - ENILimit: 15, - IPv4Limit: 50, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 15, - NetworkCardIndex: 0, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 28, }, { - MaximumNetworkInterfaces: 15, - NetworkCardIndex: 1, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 29, }, { - MaximumNetworkInterfaces: 15, - NetworkCardIndex: 2, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 30, }, { - MaximumNetworkInterfaces: 15, - NetworkCardIndex: 3, + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 31, }, }, HypervisorType: "nitro", IsBareMetal: false, }, - "p4de.24xlarge": { - ENILimit: 15, - IPv4Limit: 50, - DefaultNetworkCardIndex: 0, - NetworkCards: []NetworkCard{ - }, - HypervisorType: "nitro", - IsBareMetal: false, - }, - "p5.48xlarge": { + "p5e.48xlarge": { ENILimit: 2, IPv4Limit: 50, DefaultNetworkCardIndex: 0, @@ -10053,7 +10704,161 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 4, + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.12xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.32xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.4xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.large": { + ENILimit: 3, + IPv4Limit: 10, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 3, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r7iz.metal-16xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "r7iz.metal-32xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "r7iz.xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r8g.12xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, NetworkCardIndex: 0, }, @@ -10061,13 +10866,13 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.12xlarge": { - ENILimit: 8, - IPv4Limit: 30, + "r8g.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, DefaultNetworkCardIndex: 0, NetworkCards: []NetworkCard{ { - MaximumNetworkInterfaces: 8, + MaximumNetworkInterfaces: 15, NetworkCardIndex: 0, }, @@ -10075,7 +10880,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.16xlarge": { + "r8g.24xlarge": { ENILimit: 15, IPv4Limit: 50, DefaultNetworkCardIndex: 0, @@ -10089,7 +10894,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.2xlarge": { + "r8g.2xlarge": { ENILimit: 4, IPv4Limit: 15, DefaultNetworkCardIndex: 0, @@ -10103,7 +10908,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.32xlarge": { + "r8g.48xlarge": { ENILimit: 15, IPv4Limit: 50, DefaultNetworkCardIndex: 0, @@ -10117,7 +10922,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.4xlarge": { + "r8g.4xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -10131,7 +10936,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.8xlarge": { + "r8g.8xlarge": { ENILimit: 8, IPv4Limit: 30, DefaultNetworkCardIndex: 0, @@ -10145,7 +10950,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.large": { + "r8g.large": { ENILimit: 3, IPv4Limit: 10, DefaultNetworkCardIndex: 0, @@ -10159,7 +10964,21 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "nitro", IsBareMetal: false, }, - "r7iz.metal-16xl": { + "r8g.medium": { + ENILimit: 2, + IPv4Limit: 4, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "r8g.metal-24xl": { ENILimit: 15, IPv4Limit: 50, DefaultNetworkCardIndex: 0, @@ -10173,7 +10992,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "unknown", IsBareMetal: true, }, - "r7iz.metal-32xl": { + "r8g.metal-48xl": { ENILimit: 15, IPv4Limit: 50, DefaultNetworkCardIndex: 0, @@ -10187,7 +11006,7 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "unknown", IsBareMetal: true, }, - "r7iz.xlarge": { + "r8g.xlarge": { ENILimit: 4, IPv4Limit: 15, DefaultNetworkCardIndex: 0, @@ -10902,6 +11721,77 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "unknown", IsBareMetal: true, }, + "u7i-12tb.224xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "u7in-16tb.224xlarge": { + ENILimit: 8, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "u7in-24tb.224xlarge": { + ENILimit: 8, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "u7in-32tb.224xlarge": { + ENILimit: 8, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 1, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, "vt1.24xlarge": { ENILimit: 15, IPv4Limit: 50, @@ -11434,6 +12324,174 @@ var instanceNetworkingLimits = map[string]InstanceTypeLimits{ HypervisorType: "unknown", IsBareMetal: true, }, + "x8g.12xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.16xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.24xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.2xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.48xlarge": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.4xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.8xlarge": { + ENILimit: 8, + IPv4Limit: 30, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 8, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.large": { + ENILimit: 3, + IPv4Limit: 10, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 3, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.medium": { + ENILimit: 2, + IPv4Limit: 4, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 2, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, + "x8g.metal-24xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "x8g.metal-48xl": { + ENILimit: 15, + IPv4Limit: 50, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 15, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "unknown", + IsBareMetal: true, + }, + "x8g.xlarge": { + ENILimit: 4, + IPv4Limit: 15, + DefaultNetworkCardIndex: 0, + NetworkCards: []NetworkCard{ + { + MaximumNetworkInterfaces: 4, + NetworkCardIndex: 0, + }, + + }, + HypervisorType: "nitro", + IsBareMetal: false, + }, "z1d.12xlarge": { ENILimit: 15, IPv4Limit: 50,