Skip to content

Commit cf566af

Browse files
dshehbajdshehbaj
authored
Merge branch 'master' into shehbaj/enhanced-subnet-discovery-rebase
2 parents 892192a + ee97808 commit cf566af

File tree

8 files changed

+822
-58
lines changed

8 files changed

+822
-58
lines changed

‎.github/workflows/generate-limits.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Generate Limits
2+
3+
on:
4+
workflow_dispatch: {}
5+
schedule:
6+
- cron: "0 18 * * 1-5" # Every Monday at 10:00 PT
7+
8+
permissions:
9+
id-token: write
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
generate-limits:
15+
if: github.repository == 'aws/amazon-vpc-cni-k8s'
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # refs/tags/v4.1.7
20+
with:
21+
token: ${{ secrets.GITHUB_TOKEN }}
22+
23+
- name: Set up Go
24+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
25+
with:
26+
go-version-file: '.go-version'
27+
28+
- name: Set up AWS credentials
29+
uses: aws-actions/configure-aws-credentials@5579c002bb4778aa43395ef1df492868a9a1c83f # refs/tags/v4.0.2
30+
with:
31+
role-to-assume: ${{ secrets.OSS_TEST_ROLE_ARN }}
32+
role-duration-seconds: 900 #
33+
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
34+
35+
- name: Run generate-limits
36+
run: make generate-limits
37+
38+
- name: Check for changes
39+
id: changes
40+
run: |
41+
if git diff --quiet pkg/vpc/vpc_ip_resource_limit.go misc/eni-max-pods.txt; then
42+
echo "changed=false" >> $GITHUB_OUTPUT
43+
else
44+
echo "changed=true" >> $GITHUB_OUTPUT
45+
fi
46+
47+
- name: Create Pull Request
48+
if: steps.changes.outputs.changed == 'true'
49+
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # refs/tags/v7.0.5
50+
with:
51+
token: ${{ secrets.GITHUB_TOKEN }}
52+
commit-message: "chore: update VPC IP resource limits"
53+
title: "chore: update VPC IP resource limits"
54+
body: |
55+
This PR updates the VPC IP resource limits by running `make generate-limits`.
56+
57+
This is an automated PR created by the weekly generate-limits workflow.
58+
59+
## Changes
60+
- Updated VPC IP resource limits based on latest AWS instance types
61+
- Regenerated `pkg/vpc/vpc_ip_resource_limit.go`
62+
- Updated `eni-max-pods.txt` file for max pods per instance
63+
64+
## Testing
65+
Please verify that the generated limits are correct.
66+
branch: automated/update-vpc-limits
67+
base: master
68+
delete-branch: true

‎.github/workflows/update.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.4
1+
1.24

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ export GO111MODULE = on
7979
export GOPROXY = direct
8080

8181
export GOSUMDB = sum.golang.org
82-
export GOTOOLCHAIN = go$(GOLANG_VERSION)
8382

8483
VENDOR_OVERRIDE_FLAG =
8584
# aws-sdk-go override in case we need to build against a custom version
@@ -293,6 +292,7 @@ docker-metrics-test: ## Run metrics helper unit test suite in a container.
293292
plugins: FETCH_VERSION=1.7.1
294293
plugins: FETCH_URL=https://github.com/containernetworking/plugins/archive/refs/tags/v$(FETCH_VERSION).tar.gz
295294
plugins: VISIT_URL=https://github.com/containernetworking/plugins/tree/v$(FETCH_VERSION)/plugins/
295+
plugins: CORE_PLUGINS=bandwidth,host-local,loopback,portmap,sbr
296296
plugins: ## Fetch the CNI plugins
297297
@echo "Fetching Container networking plugins v$(FETCH_VERSION) from upstream release"
298298
@echo
@@ -303,7 +303,7 @@ plugins: ## Fetch the CNI plugins
303303
curl -s -L $(FETCH_URL) | tar xzf - -C ${CORE_PLUGIN_TMP}
304304
cd ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION} && ./build_linux.sh
305305
cp -a ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION}/LICENSE ${CORE_PLUGIN_DIR}
306-
cp -a ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION}/bin/* ${CORE_PLUGIN_DIR}
306+
cp -a ${CORE_PLUGIN_TMP}/plugins-${FETCH_VERSION}/bin/{$(CORE_PLUGINS)} ${CORE_PLUGIN_DIR}
307307
rm -rf ${CORE_PLUGIN_TMP}
308308

309309
##@ Debug script

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aws/amazon-vpc-cni-k8s
22

3-
go 1.24.4
3+
go 1.24.6
44

55
require (
66
github.com/apparentlymart/go-cidr v1.1.0
@@ -42,12 +42,12 @@ require (
4242
gopkg.in/natefinch/lumberjack.v2 v2.2.1
4343
gopkg.in/yaml.v2 v2.4.0
4444
helm.sh/helm/v3 v3.18.5
45-
k8s.io/api v0.33.3
46-
k8s.io/apimachinery v0.33.3
47-
k8s.io/cli-runtime v0.33.3
48-
k8s.io/client-go v0.33.3
45+
k8s.io/api v0.33.4
46+
k8s.io/apimachinery v0.33.4
47+
k8s.io/cli-runtime v0.33.4
48+
k8s.io/client-go v0.33.4
4949
k8s.io/klog/v2 v2.130.1
50-
sigs.k8s.io/controller-runtime v0.20.4
50+
sigs.k8s.io/controller-runtime v0.21.0
5151
)
5252

5353
require (

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -508,18 +508,18 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
508508
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
509509
helm.sh/helm/v3 v3.18.5 h1:Cc3Z5vd6kDrZq9wO9KxKLNEickiTho6/H/dBNRVSos4=
510510
helm.sh/helm/v3 v3.18.5/go.mod h1:L/dXDR2r539oPlFP1PJqKAC1CUgqHJDLkxKpDGrWnyg=
511-
k8s.io/api v0.33.3 h1:SRd5t//hhkI1buzxb288fy2xvjubstenEKL9K51KBI8=
512-
k8s.io/api v0.33.3/go.mod h1:01Y/iLUjNBM3TAvypct7DIj0M0NIZc+PzAHCIo0CYGE=
511+
k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk=
512+
k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc=
513513
k8s.io/apiextensions-apiserver v0.33.3 h1:qmOcAHN6DjfD0v9kxL5udB27SRP6SG/MTopmge3MwEs=
514514
k8s.io/apiextensions-apiserver v0.33.3/go.mod h1:oROuctgo27mUsyp9+Obahos6CWcMISSAPzQ77CAQGz8=
515-
k8s.io/apimachinery v0.33.3 h1:4ZSrmNa0c/ZpZJhAgRdcsFcZOw1PQU1bALVQ0B3I5LA=
516-
k8s.io/apimachinery v0.33.3/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
515+
k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s=
516+
k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM=
517517
k8s.io/apiserver v0.33.3 h1:Wv0hGc+QFdMJB4ZSiHrCgN3zL3QRatu56+rpccKC3J4=
518518
k8s.io/apiserver v0.33.3/go.mod h1:05632ifFEe6TxwjdAIrwINHWE2hLwyADFk5mBsQa15E=
519-
k8s.io/cli-runtime v0.33.3 h1:Dgy4vPjNIu8LMJBSvs8W0LcdV0PX/8aGG1DA1W8lklA=
520-
k8s.io/cli-runtime v0.33.3/go.mod h1:yklhLklD4vLS8HNGgC9wGiuHWze4g7x6XQZ+8edsKEo=
521-
k8s.io/client-go v0.33.3 h1:M5AfDnKfYmVJif92ngN532gFqakcGi6RvaOF16efrpA=
522-
k8s.io/client-go v0.33.3/go.mod h1:luqKBQggEf3shbxHY4uVENAxrDISLOarxpTKMiUuujg=
519+
k8s.io/cli-runtime v0.33.4 h1:V8NSxGfh24XzZVhXmIGzsApdBpGq0RQS2u/Fz1GvJwk=
520+
k8s.io/cli-runtime v0.33.4/go.mod h1:V+ilyokfqjT5OI+XE+O515K7jihtr0/uncwoyVqXaIU=
521+
k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw=
522+
k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY=
523523
k8s.io/component-base v0.33.3 h1:mlAuyJqyPlKZM7FyaoM/LcunZaaY353RXiOd2+B5tGA=
524524
k8s.io/component-base v0.33.3/go.mod h1:ktBVsBzkI3imDuxYXmVxZ2zxJnYTZ4HAsVj9iF09qp4=
525525
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
@@ -532,8 +532,8 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
532532
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
533533
oras.land/oras-go/v2 v2.6.0 h1:X4ELRsiGkrbeox69+9tzTu492FMUu7zJQW6eJU+I2oc=
534534
oras.land/oras-go/v2 v2.6.0/go.mod h1:magiQDfG6H1O9APp+rOsvCPcW1GD2MM7vgnKY0Y+u1o=
535-
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
536-
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
535+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
536+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
537537
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
538538
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
539539
sigs.k8s.io/kustomize/api v0.19.0 h1:F+2HB2mU1MSiR9Hp1NEgoU2q9ItNOaBJl0I4Dlus5SQ=

‎misc/eni-max-pods.txt‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,17 @@ i8g.8xlarge 234
414414
i8g.large 29
415415
i8g.metal-24xl 737
416416
i8g.xlarge 58
417+
i8ge.12xlarge 350
418+
i8ge.18xlarge 786
419+
i8ge.24xlarge 786
420+
i8ge.2xlarge 58
421+
i8ge.3xlarge 176
422+
i8ge.48xlarge 1178
423+
i8ge.6xlarge 292
424+
i8ge.large 29
425+
i8ge.metal-24xl 786
426+
i8ge.metal-48xl 1178
427+
i8ge.xlarge 58
417428
im4gn.16xlarge 737
418429
im4gn.2xlarge 58
419430
im4gn.4xlarge 234
@@ -651,6 +662,26 @@ m8gd.medium 8
651662
m8gd.metal-24xl 737
652663
m8gd.metal-48xl 737
653664
m8gd.xlarge 58
665+
m8i-flex.12xlarge 590
666+
m8i-flex.16xlarge 1010
667+
m8i-flex.2xlarge 118
668+
m8i-flex.4xlarge 394
669+
m8i-flex.8xlarge 492
670+
m8i-flex.large 59
671+
m8i-flex.xlarge 118
672+
m8i.12xlarge 590
673+
m8i.16xlarge 1010
674+
m8i.24xlarge 1010
675+
m8i.2xlarge 118
676+
m8i.32xlarge 1514
677+
m8i.48xlarge 1514
678+
m8i.4xlarge 394
679+
m8i.8xlarge 492
680+
m8i.96xlarge 1514
681+
m8i.large 59
682+
m8i.metal-48xl 1514
683+
m8i.metal-96xl 1514
684+
m8i.xlarge 118
654685
mac1.metal 234
655686
mac2-m1ultra.metal 234
656687
mac2-m2.metal 234
@@ -663,6 +694,7 @@ p3dn.24xlarge 737
663694
p4d.24xlarge 737
664695
p4de.24xlarge 737
665696
p5.48xlarge 100
697+
p5.4xlarge 118
666698
p5e.48xlarge 100
667699
p5en.48xlarge 198
668700
p6-b200.48xlarge 198
@@ -882,6 +914,26 @@ r8gd.medium 8
882914
r8gd.metal-24xl 737
883915
r8gd.metal-48xl 737
884916
r8gd.xlarge 58
917+
r8i-flex.12xlarge 590
918+
r8i-flex.16xlarge 1010
919+
r8i-flex.2xlarge 118
920+
r8i-flex.4xlarge 394
921+
r8i-flex.8xlarge 492
922+
r8i-flex.large 59
923+
r8i-flex.xlarge 118
924+
r8i.12xlarge 590
925+
r8i.16xlarge 1010
926+
r8i.24xlarge 1010
927+
r8i.2xlarge 118
928+
r8i.32xlarge 1514
929+
r8i.48xlarge 1514
930+
r8i.4xlarge 394
931+
r8i.8xlarge 492
932+
r8i.96xlarge 1514
933+
r8i.large 59
934+
r8i.metal-48xl 1514
935+
r8i.metal-96xl 1514
936+
r8i.xlarge 118
885937
t1.micro 4
886938
t2.2xlarge 44
887939
t2.large 35

0 commit comments

Comments
 (0)