Cherry-pick 2255, 2235 and 2250

Makefile

@@ -57,7 +57,7 @@ export DOCKER_BUILDKIT=1
 GOARCH = $(TARGETARCH)
 
 # GOLANG_IMAGE is the building golang container image used.
-GOLANG_IMAGE = public.ecr.aws/eks-distro-build-tooling/golang:1.19.2-1-gcc-al2
+GOLANG_IMAGE = public.ecr.aws/eks-distro-build-tooling/golang:1.19.5-1-gcc-al2
 # For the requested build, these are the set of Go specific build environment variables.
 export GOOS = linux
 export CGO_ENABLED = 0
@@ -318,6 +318,7 @@ format:       ## Format all Go source code files. (Note! integration_test.go has
 	  -not -name 'integration_test.go' \
 	  -not -name 'mock_publisher.go' \
 	  -not -name 'rpc.pb.go' \
+	  -not -name 'vpc_ip_resource_limit.go' \
 	  -name '*.go' \
 	  -print0 | sort -z | xargs -0 -- goimports $(or $(FORMAT_FLAGS),-w) | wc -l | bc)
 

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 2022-09-21T13:34:09-07:00
+# This file was generated at 2023-02-07T22:38:44Z
 #
 # The regions queried were:
 # - ap-northeast-1
@@ -158,6 +158,15 @@ c6id.8xlarge 234
 c6id.large 29
 c6id.metal 737
 c6id.xlarge 58
+c6in.12xlarge 234
+c6in.16xlarge 737
+c6in.24xlarge 737
+c6in.2xlarge 58
+c6in.32xlarge 345
+c6in.4xlarge 234
+c6in.8xlarge 234
+c6in.large 29
+c6in.xlarge 58
 c7g.12xlarge 234
 c7g.16xlarge 737
 c7g.2xlarge 58
@@ -209,7 +218,7 @@ g5.12xlarge 737
 g5.16xlarge 234
 g5.24xlarge 737
 g5.2xlarge 58
-g5.48xlarge 737
+g5.48xlarge 345
 g5.4xlarge 234
 g5.8xlarge 234
 g5.xlarge 58
@@ -224,6 +233,7 @@ h1.2xlarge 58
 h1.4xlarge 234
 h1.8xlarge 234
 hpc6a.48xlarge 100
+hpc6id.32xlarge 51
 hs1.8xlarge 234
 i2.2xlarge 58
 i2.4xlarge 234
@@ -393,6 +403,33 @@ m6id.8xlarge 234
 m6id.large 29
 m6id.metal 737
 m6id.xlarge 58
+m6idn.12xlarge 234
+m6idn.16xlarge 737
+m6idn.24xlarge 737
+m6idn.2xlarge 58
+m6idn.32xlarge 345
+m6idn.4xlarge 234
+m6idn.8xlarge 234
+m6idn.large 29
+m6idn.xlarge 58
+m6in.12xlarge 234
+m6in.16xlarge 737
+m6in.24xlarge 737
+m6in.2xlarge 58
+m6in.32xlarge 345
+m6in.4xlarge 234
+m6in.8xlarge 234
+m6in.large 29
+m6in.xlarge 58
+m7g.12xlarge 234
+m7g.16xlarge 737
+m7g.2xlarge 58
+m7g.4xlarge 234
+m7g.8xlarge 234
+m7g.large 29
+m7g.medium 8
+m7g.metal 737
+m7g.xlarge 58
 mac1.metal 234
 mac2.metal 234
 p2.16xlarge 234
@@ -525,6 +562,33 @@ r6id.8xlarge 234
 r6id.large 29
 r6id.metal 737
 r6id.xlarge 58
+r6idn.12xlarge 234
+r6idn.16xlarge 737
+r6idn.24xlarge 737
+r6idn.2xlarge 58
+r6idn.32xlarge 345
+r6idn.4xlarge 234
+r6idn.8xlarge 234
+r6idn.large 29
+r6idn.xlarge 58
+r6in.12xlarge 234
+r6in.16xlarge 737
+r6in.24xlarge 737
+r6in.2xlarge 58
+r6in.32xlarge 345
+r6in.4xlarge 234
+r6in.8xlarge 234
+r6in.large 29
+r6in.xlarge 58
+r7g.12xlarge 234
+r7g.16xlarge 737
+r7g.2xlarge 58
+r7g.4xlarge 234
+r7g.8xlarge 234
+r7g.large 29
+r7g.medium 8
+r7g.metal 737
+r7g.xlarge 58
 t1.micro 4
 t2.2xlarge 44
 t2.large 35
@@ -558,7 +622,9 @@ trn1.2xlarge 58
 trn1.32xlarge 247
 u-12tb1.112xlarge 737
 u-12tb1.metal 147
+u-18tb1.112xlarge 737
 u-18tb1.metal 737
+u-24tb1.112xlarge 737
 u-24tb1.metal 737
 u-3tb1.56xlarge 234
 u-6tb1.112xlarge 737
@@ -577,6 +643,12 @@ 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