Merge branch 'master' into release-1.21

Author: jaydeokar

.github/actions/govulncheck/action.yaml

@@ -7,7 +7,7 @@ inputs:
   check-latest:
     description: 'Set this option to true if you want the action to always check for the latest available Go version that satisfies the version spec'
     required: false
-    default: false
+    default: true
   cache:
     description: 'Used to specify whether Go caching is needed. Set to true, if you would like to enable caching.'
     required: false
@@ -32,7 +32,7 @@ runs:
   steps:
     - if: inputs.repo-checkout != false # only explicit false prevents repo checkout
       uses: actions/checkout@v4
-    - uses: actions/setup-go@v4.0.0
+    - uses: actions/setup-go@v6.1.0
       with:
         go-version: ${{ inputs.go-version-input }}
         check-latest: ${{ inputs.check-latest }}

CHANGELOG.md

@@ -6,7 +6,7 @@
 * Bump the aws-dependencies group with 9 updates by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3465
 * chore: update VPC IP resource limits by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3476
 * bumping kops tag to v1.34 by @Supreeth095 in https://github.com/aws/amazon-vpc-cni-k8s/issues/3477
-* feat: add retry logic for netlink dump operations by yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3440
+* feat: add retry logic for netlink dump operations by @dcoppa in https://github.com/aws/amazon-vpc-cni-k8s/pull/3440
 * chore: update VPC IP resource limits by @yash97 in https://github.com/aws/amazon-vpc-cni-k8s/pull/3481
 * Updating network policy agent version by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3491
 * Bump actions/dependency-review-action from 4.3.3 to 4.8.1 by @jaydeokar in https://github.com/aws/amazon-vpc-cni-k8s/pull/3485

config/master/aws-k8s-cni-cn.yaml

@@ -300,7 +300,7 @@ metadata:
     app.kubernetes.io/name: aws-node
     app.kubernetes.io/instance: aws-vpc-cni
     k8s-app: aws-node
-    app.kubernetes.io/version: "v1.20.4"
+    app.kubernetes.io/version: "v1.20.5"
 ---
 # Source: aws-vpc-cni/templates/configmap.yaml
 apiVersion: v1
@@ -312,7 +312,7 @@ metadata:
     app.kubernetes.io/name: aws-node
     app.kubernetes.io/instance: aws-vpc-cni
     k8s-app: aws-node
-    app.kubernetes.io/version: "v1.20.4"
+    app.kubernetes.io/version: "v1.20.5"
 data:
   enable-windows-ipam: "false"
   enable-network-policy-controller: "false"
@@ -331,7 +331,7 @@ metadata:
     app.kubernetes.io/name: aws-node
     app.kubernetes.io/instance: aws-vpc-cni
     k8s-app: aws-node
-    app.kubernetes.io/version: "v1.20.4"
+    app.kubernetes.io/version: "v1.20.5"
 rules:
   - apiGroups:
       - crd.k8s.amazonaws.com
@@ -377,7 +377,7 @@ metadata:
     app.kubernetes.io/name: aws-node
     app.kubernetes.io/instance: aws-vpc-cni
     k8s-app: aws-node
-    app.kubernetes.io/version: "v1.20.4"
+    app.kubernetes.io/version: "v1.20.5"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -397,7 +397,7 @@ metadata:
     app.kubernetes.io/name: aws-node
     app.kubernetes.io/instance: aws-vpc-cni
     k8s-app: aws-node
-    app.kubernetes.io/version: "v1.20.4"
+    app.kubernetes.io/version: "v1.20.5"
 spec:
   updateStrategy:
     rollingUpdate:
@@ -418,7 +418,7 @@ spec:
       hostNetwork: true
       initContainers:
       - name: aws-vpc-cni-init
-        image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.20.4
+        image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.20.5
         imagePullPolicy: Always
         env:
           - name: DISABLE_TCP_EARLY_DEMUX
@@ -440,7 +440,7 @@ spec:
         {}
       containers:
         - name: aws-node
-          image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.20.4
+          image: 961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.20.5
           ports:
             - containerPort: 61678
               name: metrics
@@ -508,7 +508,7 @@ spec:
             - name: NETWORK_POLICY_ENFORCING_MODE
               value: "standard"
             - name: VPC_CNI_VERSION
-              value: "v1.20.4"
+              value: "v1.20.5"
             - name: WARM_ENI_TARGET
               value: "1"
             - name: WARM_PREFIX_TARGET

go.mod

@@ -1,6 +1,6 @@
 module github.com/aws/amazon-vpc-cni-k8s
 
-go 1.25.3
+go 1.25.5
 
 require (
 	github.com/apparentlymart/go-cidr v1.1.0

misc/eni-max-pods.txt

@@ -226,6 +226,18 @@ c7i.large 29
 c7i.metal-24xl 737
 c7i.metal-48xl 737
 c7i.xlarge 58
+c8a.12xlarge 758
+c8a.16xlarge 1010
+c8a.24xlarge 1010
+c8a.2xlarge 158
+c8a.48xlarge 1514
+c8a.4xlarge 314
+c8a.8xlarge 392
+c8a.large 59
+c8a.medium 8
+c8a.metal-24xl 1010
+c8a.metal-48xl 1514
+c8a.xlarge 78
 c8g.12xlarge 234
 c8g.16xlarge 737
 c8g.24xlarge 737
@@ -1089,6 +1101,14 @@ x2iezn.4xlarge 234
 x2iezn.6xlarge 234
 x2iezn.8xlarge 234
 x2iezn.metal 737
+x8aedz.12xlarge 1010
+x8aedz.24xlarge 1010
+x8aedz.3xlarge 314
+x8aedz.6xlarge 314
+x8aedz.large 78
+x8aedz.metal-12xl 1010
+x8aedz.metal-24xl 1010
+x8aedz.xlarge 78
 x8g.12xlarge 234
 x8g.16xlarge 737
 x8g.24xlarge 737