diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt index f82b87d9f5..efe2ab6d74 100644 --- a/misc/eni-max-pods.txt +++ b/misc/eni-max-pods.txt @@ -176,6 +176,14 @@ c7g.large 29 c7g.medium 8 c7g.metal 737 c7g.xlarge 58 +c7gd.12xlarge 234 +c7gd.16xlarge 737 +c7gd.2xlarge 58 +c7gd.4xlarge 234 +c7gd.8xlarge 234 +c7gd.large 29 +c7gd.medium 8 +c7gd.xlarge 58 c7gn.12xlarge 234 c7gn.16xlarge 737 c7gn.2xlarge 58 @@ -241,6 +249,10 @@ h1.4xlarge 234 h1.8xlarge 234 hpc6a.48xlarge 100 hpc6id.32xlarge 51 +hpc7a.12xlarge 100 +hpc7a.24xlarge 100 +hpc7a.48xlarge 100 +hpc7a.96xlarge 100 hpc7g.16xlarge 198 hpc7g.4xlarge 198 hpc7g.8xlarge 198 @@ -443,6 +455,18 @@ m6in.8xlarge 234 m6in.large 29 m6in.metal 345 m6in.xlarge 58 +m7a.12xlarge 234 +m7a.16xlarge 737 +m7a.24xlarge 737 +m7a.2xlarge 58 +m7a.32xlarge 737 +m7a.48xlarge 737 +m7a.4xlarge 234 +m7a.8xlarge 234 +m7a.large 29 +m7a.medium 8 +m7a.metal-48xl 737 +m7a.xlarge 58 m7g.12xlarge 234 m7g.16xlarge 737 m7g.2xlarge 58 @@ -452,6 +476,28 @@ m7g.large 29 m7g.medium 8 m7g.metal 737 m7g.xlarge 58 +m7gd.12xlarge 234 +m7gd.16xlarge 737 +m7gd.2xlarge 58 +m7gd.4xlarge 234 +m7gd.8xlarge 234 +m7gd.large 29 +m7gd.medium 8 +m7gd.xlarge 58 +m7i-flex.2xlarge 58 +m7i-flex.4xlarge 234 +m7i-flex.8xlarge 234 +m7i-flex.large 29 +m7i-flex.xlarge 58 +m7i.12xlarge 234 +m7i.16xlarge 737 +m7i.24xlarge 737 +m7i.2xlarge 58 +m7i.48xlarge 737 +m7i.4xlarge 234 +m7i.8xlarge 234 +m7i.large 29 +m7i.xlarge 58 mac1.metal 234 mac2.metal 234 p2.16xlarge 234 @@ -463,6 +509,7 @@ p3.8xlarge 234 p3dn.24xlarge 737 p4d.24xlarge 737 p4de.24xlarge 737 +p5.48xlarge 100 r3.2xlarge 58 r3.4xlarge 234 r3.8xlarge 234 @@ -613,6 +660,14 @@ r7g.large 29 r7g.medium 8 r7g.metal 737 r7g.xlarge 58 +r7gd.12xlarge 234 +r7gd.16xlarge 737 +r7gd.2xlarge 58 +r7gd.4xlarge 234 +r7gd.8xlarge 234 +r7gd.large 29 +r7gd.medium 8 +r7gd.xlarge 58 t1.micro 4 t2.2xlarge 44 t2.large 35 diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go index 4412d94186..75d233e0f8 100644 --- a/pkg/awsutils/vpc_ip_resource_limit.go +++ b/pkg/awsutils/vpc_ip_resource_limit.go @@ -174,6 +174,14 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "c7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, "c7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:true}, "c7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, + "c7gd.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, "c7gn.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, "c7gn.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "c7gn.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, @@ -239,6 +247,10 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "h1.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"xen", IsBareMetal:false}, "hpc6a.48xlarge":{ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "hpc6id.32xlarge":{ENILimit: 1, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "hpc7a.12xlarge":{ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "hpc7a.24xlarge":{ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "hpc7a.48xlarge":{ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "hpc7a.96xlarge":{ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "hpc7g.16xlarge":{ENILimit: 4, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "hpc7g.4xlarge": {ENILimit: 4, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "hpc7g.8xlarge": {ENILimit: 4, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, @@ -441,6 +453,18 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "m6in.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, "m6in.metal": {ENILimit: 7, IPv4Limit: 50, HypervisorType:"", IsBareMetal:true}, "m6in.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.32xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.48xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, + "m7a.metal-48xl":{ENILimit: 15, IPv4Limit: 50, HypervisorType:"", IsBareMetal:true}, + "m7a.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, "m7g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, "m7g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "m7g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, @@ -450,6 +474,28 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "m7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, "m7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"", IsBareMetal:true}, "m7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, + "m7gd.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7i-flex.2xlarge":{ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7i-flex.4xlarge":{ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7i-flex.8xlarge":{ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7i-flex.large":{ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "m7i-flex.xlarge":{ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.48xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "m7i.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, "mac1.metal": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"", IsBareMetal:true}, "mac2.metal": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"", IsBareMetal:true}, "p2.16xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"xen", IsBareMetal:false}, @@ -461,6 +507,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "p3dn.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "p4d.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "p4de.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "p5.48xlarge": {ENILimit: 2, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, "r3.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"xen", IsBareMetal:false}, "r3.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"xen", IsBareMetal:false}, "r3.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"xen", IsBareMetal:false}, @@ -611,6 +658,14 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "r7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, "r7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"", IsBareMetal:true}, "r7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, + "r7gd.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, "t1.micro": {ENILimit: 2, IPv4Limit: 2, HypervisorType:"xen", IsBareMetal:false}, "t2.2xlarge": {ENILimit: 3, IPv4Limit: 15, HypervisorType:"xen", IsBareMetal:false}, "t2.large": {ENILimit: 3, IPv4Limit: 12, HypervisorType:"xen", IsBareMetal:false},