diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt index 9f39ad0ed9..a052ce1e86 100644 --- a/misc/eni-max-pods.txt +++ b/misc/eni-max-pods.txt @@ -11,7 +11,7 @@ # express or implied. See the License for the specific language governing # permissions and limitations under the License. # -# This file was generated at 2020-08-04T15:58:40-07:00 +# This file was generated at 2020-11-25T20:35:51Z # # Mapping is calculated from AWS EC2 API using the following formula: # * First IP on each ENI is not used for pods @@ -146,7 +146,7 @@ i3en.6xlarge 234 i3en.large 29 i3en.metal 737 i3en.xlarge 58 -inf1.24xlarge 437 +inf1.24xlarge 321 inf1.2xlarge 38 inf1.6xlarge 234 inf1.xlarge 38 @@ -242,6 +242,7 @@ p3.16xlarge 234 p3.2xlarge 58 p3.8xlarge 234 p3dn.24xlarge 737 +p4d.24xlarge 737 r3.2xlarge 58 r3.4xlarge 234 r3.8xlarge 234 @@ -343,6 +344,13 @@ t3a.micro 4 t3a.nano 4 t3a.small 8 t3a.xlarge 58 +t4g.2xlarge 58 +t4g.large 35 +t4g.medium 17 +t4g.micro 4 +t4g.nano 4 +t4g.small 11 +t4g.xlarge 58 u-12tb1.metal 147 u-18tb1.metal 737 u-24tb1.metal 737 diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go index 02d69f2500..3c1eedee0c 100644 --- a/pkg/awsutils/vpc_ip_resource_limit.go +++ b/pkg/awsutils/vpc_ip_resource_limit.go @@ -12,7 +12,7 @@ // permissions and limitations under the License. // Code generated by go generate; DO NOT EDIT. -// This file was generated at 2020-08-04T15:58:40-07:00 +// This file was generated at 2020-11-25T20:35:51Z package awsutils @@ -144,7 +144,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "i3en.large": {ENILimit: 3, IPv4Limit: 10}, "i3en.metal": {ENILimit: 15, IPv4Limit: 50}, "i3en.xlarge": {ENILimit: 4, IPv4Limit: 15}, - "inf1.24xlarge": {ENILimit: 15, IPv4Limit: 30}, + "inf1.24xlarge": {ENILimit: 11, IPv4Limit: 30}, "inf1.2xlarge": {ENILimit: 4, IPv4Limit: 10}, "inf1.6xlarge": {ENILimit: 8, IPv4Limit: 30}, "inf1.xlarge": {ENILimit: 4, IPv4Limit: 10}, @@ -240,6 +240,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "p3.2xlarge": {ENILimit: 4, IPv4Limit: 15}, "p3.8xlarge": {ENILimit: 8, IPv4Limit: 30}, "p3dn.24xlarge": {ENILimit: 15, IPv4Limit: 50}, + "p4d.24xlarge": {ENILimit: 15, IPv4Limit: 50}, "r3.2xlarge": {ENILimit: 4, IPv4Limit: 15}, "r3.4xlarge": {ENILimit: 8, IPv4Limit: 30}, "r3.8xlarge": {ENILimit: 8, IPv4Limit: 30}, @@ -341,6 +342,13 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "t3a.nano": {ENILimit: 2, IPv4Limit: 2}, "t3a.small": {ENILimit: 2, IPv4Limit: 4}, "t3a.xlarge": {ENILimit: 4, IPv4Limit: 15}, + "t4g.2xlarge": {ENILimit: 4, IPv4Limit: 15}, + "t4g.large": {ENILimit: 3, IPv4Limit: 12}, + "t4g.medium": {ENILimit: 3, IPv4Limit: 6}, + "t4g.micro": {ENILimit: 2, IPv4Limit: 2}, + "t4g.nano": {ENILimit: 2, IPv4Limit: 2}, + "t4g.small": {ENILimit: 3, IPv4Limit: 4}, + "t4g.xlarge": {ENILimit: 4, IPv4Limit: 15}, "u-12tb1.metal": {ENILimit: 5, IPv4Limit: 30}, "u-18tb1.metal": {ENILimit: 15, IPv4Limit: 50}, "u-24tb1.metal": {ENILimit: 15, IPv4Limit: 50}, diff --git a/scripts/gen_vpc_ip_limits.go b/scripts/gen_vpc_ip_limits.go index 1bc4bbf079..e706955913 100644 --- a/scripts/gen_vpc_ip_limits.go +++ b/scripts/gen_vpc_ip_limits.go @@ -149,15 +149,9 @@ func addManualLimits(limitMap map[string]awsutils.InstanceTypeLimits) map[string "u-6tb1.metal": {ENILimit: 5, IPv4Limit: 30}, "u-9tb1.metal": {ENILimit: 5, IPv4Limit: 30}, "c5a.metal": {ENILimit: 15, IPv4Limit: 50}, - "c5ad.12xlarge": {ENILimit: 8, IPv4Limit: 30}, - "c5ad.16xlarge": {ENILimit: 15, IPv4Limit: 50}, - "c5ad.24xlarge": {ENILimit: 15, IPv4Limit: 50}, - "c5ad.2xlarge": {ENILimit: 4, IPv4Limit: 15}, - "c5ad.4xlarge": {ENILimit: 8, IPv4Limit: 30}, - "c5ad.8xlarge": {ENILimit: 8, IPv4Limit: 30}, - "c5ad.large": {ENILimit: 3, IPv4Limit: 10}, "c5ad.metal": {ENILimit: 15, IPv4Limit: 50}, "c5ad.xlarge": {ENILimit: 4, IPv4Limit: 15}, + "p4d.24xlarge": {ENILimit: 15, IPv4Limit: 50}, } for instanceType, instanceLimits := range manuallyAddedLimits { val, ok := limitMap[instanceType]