From f7f511cffd7682d682832cf4d982501d64913eb0 Mon Sep 17 00:00:00 2001 From: Supreeth Ramakrishna Date: Mon, 3 Nov 2025 04:12:48 +0000 Subject: [PATCH 1/2] Go bump --- .go-version | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.go-version b/.go-version index 3900bcd9fd..5e2b950027 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24 +1.25 diff --git a/go.mod b/go.mod index 0a5b017328..036314d6bf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-vpc-cni-k8s -go 1.24.9 +go 1.25.3 require ( github.com/apparentlymart/go-cidr v1.1.0 From 1eecfbe30d0fa37b9f1c8b26fc67521ad9e2055d Mon Sep 17 00:00:00 2001 From: Supreeth Ramakrishna Date: Mon, 3 Nov 2025 04:24:57 +0000 Subject: [PATCH 2/2] go bump --- .github/workflows/integration-tests.yaml | 2 +- .github/workflows/kops-test.yaml | 2 +- .github/workflows/nightly-cron-tests.yaml | 2 +- .github/workflows/pr-automated-tests.yaml | 6 +++--- .github/workflows/pr-manual-tests.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/soak-tests.yml | 2 +- .github/workflows/weekly-cron-tests.yaml | 2 +- test/agent/go.mod | 5 +++-- test/agent/go.sum | 6 ++++-- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 64a9429db4..9e55411c46 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -24,7 +24,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/kops-test.yaml b/.github/workflows/kops-test.yaml index 1c043e81f6..2921ee5129 100644 --- a/.github/workflows/kops-test.yaml +++ b/.github/workflows/kops-test.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/nightly-cron-tests.yaml b/.github/workflows/nightly-cron-tests.yaml index c4923a3704..55f97bdbd1 100644 --- a/.github/workflows/nightly-cron-tests.yaml +++ b/.github/workflows/nightly-cron-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/pr-automated-tests.yaml b/.github/workflows/pr-automated-tests.yaml index 9aa30e2801..98df29f560 100644 --- a/.github/workflows/pr-automated-tests.yaml +++ b/.github/workflows/pr-automated-tests.yaml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" check-latest: true - name: Set up tools run: | @@ -54,7 +54,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" check-latest: true - name: Build CNI images run: make multi-arch-cni-build @@ -71,7 +71,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" check-latest: true - name: Build CNI Init images run: make multi-arch-cni-init-build diff --git a/.github/workflows/pr-manual-tests.yaml b/.github/workflows/pr-manual-tests.yaml index ad4754c3ab..6f8fc9a6a3 100644 --- a/.github/workflows/pr-manual-tests.yaml +++ b/.github/workflows/pr-manual-tests.yaml @@ -29,7 +29,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ae9111a80c..62a088a0c9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Generate CNI YAML run: make generate-cni-yaml - name: Create eks-charts PR diff --git a/.github/workflows/soak-tests.yml b/.github/workflows/soak-tests.yml index e1534cdbc0..1230551425 100644 --- a/.github/workflows/soak-tests.yml +++ b/.github/workflows/soak-tests.yml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/.github/workflows/weekly-cron-tests.yaml b/.github/workflows/weekly-cron-tests.yaml index f745bb9917..e0e969596c 100644 --- a/.github/workflows/weekly-cron-tests.yaml +++ b/.github/workflows/weekly-cron-tests.yaml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0 with: - go-version: "1.24" + go-version: "1.25" - name: Set up tools run: | # Install ginkgo version from go.mod diff --git a/test/agent/go.mod b/test/agent/go.mod index 58db8289e9..3803cfff9a 100644 --- a/test/agent/go.mod +++ b/test/agent/go.mod @@ -1,11 +1,12 @@ module github.com/aws/amazon-vpc-cni-k8s/test/agent -go 1.24.1 +go 1.25.3 require ( + github.com/aws/amazon-vpc-cni-k8s v1.20.4 github.com/coreos/go-iptables v0.8.0 github.com/vishvananda/netlink v1.3.1 - golang.org/x/sys v0.32.0 + golang.org/x/sys v0.34.0 ) require github.com/vishvananda/netns v0.0.5 // indirect diff --git a/test/agent/go.sum b/test/agent/go.sum index b778cc6829..adc4b58412 100644 --- a/test/agent/go.sum +++ b/test/agent/go.sum @@ -1,3 +1,5 @@ +github.com/aws/amazon-vpc-cni-k8s v1.20.4 h1:GLij+rFUE6gtUncGXeJqwlzDx10CTzDCf3746YXa1m8= +github.com/aws/amazon-vpc-cni-k8s v1.20.4/go.mod h1:HfKBVKc/z9vSFZN06uWOWfwFKthvl10hGoSWhIwiF0A= github.com/coreos/go-iptables v0.8.0 h1:MPc2P89IhuVpLI7ETL/2tx3XZ61VeICZjYqDEgNsPRc= github.com/coreos/go-iptables v0.8.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW6bV0= @@ -6,5 +8,5 @@ github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zd github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA= +golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=