From 67e1c897a9a6735ae36319e9449cc7b2c5fce4d0 Mon Sep 17 00:00:00 2001 From: Victor Pineda Date: Mon, 27 Feb 2023 09:24:57 -0800 Subject: [PATCH] Add bmn-sf1.metal instance support --- misc/eni-max-pods.txt | 9 ++----- pkg/awsutils/vpc_ip_resource_limit.go | 39 ++++++++++++++------------- scripts/gen_vpc_ip_limits.go | 1 + 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/misc/eni-max-pods.txt b/misc/eni-max-pods.txt index d7aa1db4c6f..544b3ce9d62 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 2023-02-07T22:38:44Z +# This file was generated at 2023-02-27T15:22:09Z # # The regions queried were: # - ap-northeast-1 @@ -46,6 +46,7 @@ a1.large 29 a1.medium 8 a1.metal 234 a1.xlarge 58 +bmn-sf1.metal 737 c1.medium 12 c1.xlarge 58 c3.2xlarge 58 @@ -643,12 +644,6 @@ x1e.32xlarge 234 x1e.4xlarge 58 x1e.8xlarge 58 x1e.xlarge 29 -x2ezn.12xlarge 737 -x2ezn.2xlarge 58 -x2ezn.4xlarge 234 -x2ezn.6xlarge 234 -x2ezn.8xlarge 234 -x2ezn.metal 737 x2gd.12xlarge 234 x2gd.16xlarge 737 x2gd.2xlarge 58 diff --git a/pkg/awsutils/vpc_ip_resource_limit.go b/pkg/awsutils/vpc_ip_resource_limit.go index 8406f8a247c..e22f1b55024 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 2023-02-02T10:15:26-08:00 +// This file was generated at 2023-02-27T15:22:09Z // // The regions queried were: // - ap-northeast-1 @@ -43,6 +43,7 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "a1.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"nitro", IsBareMetal:false}, "a1.metal": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"", IsBareMetal:true}, "a1.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "bmn-sf1.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"unknown", IsBareMetal:true}, "c1.medium": {ENILimit: 2, IPv4Limit: 6, HypervisorType:"xen", IsBareMetal:false}, "c1.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"xen", IsBareMetal:false}, "c3.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"xen", IsBareMetal:false}, @@ -418,15 +419,15 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "m6in.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, "m6in.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, "m6in.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, - "m7g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"unknown", IsBareMetal:false}, - "m7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"unknown", IsBareMetal:true}, - "m7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"unknown", 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}, + "m7g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "m7g.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "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}, "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}, @@ -577,15 +578,15 @@ var InstanceNetworkingLimits = map[string]InstanceTypeLimits{ "r6in.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, "r6in.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, "r6in.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, - "r7g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.medium": {ENILimit: 2, IPv4Limit: 4, HypervisorType:"unknown", IsBareMetal:false}, - "r7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"unknown", IsBareMetal:true}, - "r7g.xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"unknown", IsBareMetal:false}, + "r7g.12xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7g.16xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType:"nitro", IsBareMetal:false}, + "r7g.2xlarge": {ENILimit: 4, IPv4Limit: 15, HypervisorType:"nitro", IsBareMetal:false}, + "r7g.4xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7g.8xlarge": {ENILimit: 8, IPv4Limit: 30, HypervisorType:"nitro", IsBareMetal:false}, + "r7g.large": {ENILimit: 3, IPv4Limit: 10, HypervisorType:"nitro", IsBareMetal:false}, + "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}, "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}, diff --git a/scripts/gen_vpc_ip_limits.go b/scripts/gen_vpc_ip_limits.go index c3f11b8add4..5ee298b8ff1 100644 --- a/scripts/gen_vpc_ip_limits.go +++ b/scripts/gen_vpc_ip_limits.go @@ -203,6 +203,7 @@ func addManualLimits(limitMap map[string]awsutils.InstanceTypeLimits) map[string "c5ad.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true}, "p4de.24xlarge": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: false}, "c7g.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true}, + "bmn-sf1.metal": {ENILimit: 15, IPv4Limit: 50, HypervisorType: "unknown", IsBareMetal: true}, } for instanceType, instanceLimits := range manuallyAddedLimits { val, ok := limitMap[instanceType]