Skip to content

Commit 65e925f

Browse files
jaydeokarjaydeokar
authored
Merge branch 'master' into release-1.20
2 parents db19d13 + cb32ce6 commit 65e925f

File tree

31 files changed

+1077
-144
lines changed

31 files changed

+1077
-144
lines changed

‎.github/workflows/deps.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
with:
1717
show-progress: false
1818
- name: "Dependency Review"
19-
uses: actions/dependency-review-action@72eb03d02c7872a771aacd928f3123ac62ad6d3a # refs/tags/v4.3.3
19+
uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # refs/tags/v4.8.1
2020
govulncheck:
2121
runs-on: ubuntu-latest
2222
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
token: ${{ secrets.GITHUB_TOKEN }}
2222

2323
- name: Set up Go
24-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
24+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2525
with:
2626
go-version-file: '.go-version'
2727

‎.github/workflows/integration-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
- name: Set up Docker Buildx
2323
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
2424
- name: Set up Go
25-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
25+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2626
with:
27-
go-version: "1.24"
27+
go-version: "1.25"
2828
- name: Set up tools
2929
run: |
3030
# Install ginkgo version from go.mod

‎.github/workflows/kops-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
- name: Set up Docker Buildx
2222
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
2323
- name: Set up Go
24-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
24+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2525
with:
26-
go-version: "1.24"
26+
go-version: "1.25"
2727
- name: Set up tools
2828
run: |
2929
# Install ginkgo version from go.mod
@@ -43,8 +43,8 @@ jobs:
4343
ROLE_ARN: ${{ secrets.EKS_CLUSTER_ROLE_ARN }}
4444
RUN_CNI_INTEGRATION_TESTS: false
4545
RUN_KOPS_TEST: true
46-
K8S_VERSION: 1.33.0-beta.0
47-
KOPS_VERSION: v1.33.0-beta.1
46+
K8S_VERSION: 1.34.0-beta.0
47+
KOPS_VERSION: v1.34.0-beta.1
4848
KOPS_RUN_TOO_NEW_VERSION: 1
4949
run: |
5050
./scripts/run-integration-tests.sh

‎.github/workflows/nightly-cron-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
- name: Set up Docker Buildx
2222
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
2323
- name: Set up Go
24-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
24+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2525
with:
26-
go-version: "1.24"
26+
go-version: "1.25"
2727
- name: Set up tools
2828
run: |
2929
# Install ginkgo version from go.mod

‎.github/workflows/pr-automated-tests.yaml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ jobs:
1515
- name: Checkout latest commit in the PR
1616
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # refs/tags/v5.0.0
1717
- name: Set up Go
18-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
18+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
1919
with:
20-
go-version: "1.24"
20+
go-version: "1.25"
21+
check-latest: true
2122
- name: Set up tools
2223
run: |
2324
go install golang.org/x/lint/golint@latest
@@ -51,9 +52,10 @@ jobs:
5152
- name: Set up Docker Buildx
5253
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
5354
- name: Set up Go
54-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
55+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
5556
with:
56-
go-version: "1.24"
57+
go-version: "1.25"
58+
check-latest: true
5759
- name: Build CNI images
5860
run: make multi-arch-cni-build
5961
docker-build-init:
@@ -67,8 +69,9 @@ jobs:
6769
- name: Set up Docker Buildx
6870
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
6971
- name: Set up Go
70-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
72+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
7173
with:
72-
go-version: "1.24"
74+
go-version: "1.25"
75+
check-latest: true
7376
- name: Build CNI Init images
7477
run: make multi-arch-cni-init-build

‎.github/workflows/pr-manual-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
2929
- name: Set up Go
30-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
30+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
3131
with:
32-
go-version: "1.24"
32+
go-version: "1.25"
3333
- name: Set up tools
3434
run: |
3535
# Install ginkgo version from go.mod

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
with:
2121
ref: "refs/tags/${{ github.event.release.tag_name }}"
2222
- name: Set up Go
23-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
23+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2424
with:
25-
go-version: "1.24"
25+
go-version: "1.25"
2626
- name: Generate CNI YAML
2727
run: make generate-cni-yaml
2828
- name: Create eks-charts PR

‎.github/workflows/soak-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
- name: Checkout latest commit in the PR
1717
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # refs/tags/v5.0.0
1818
- name: Set up Go
19-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
19+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2020
with:
21-
go-version: "1.24"
21+
go-version: "1.25"
2222
- name: Set up tools
2323
run: |
2424
# Install ginkgo version from go.mod

‎.github/workflows/weekly-cron-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
- name: Set up Docker Buildx
2222
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # refs/tags/v3.11.1
2323
- name: Set up Go
24-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # refs/tags/v5.5.0
24+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # refs/tags/v6.0.0
2525
with:
26-
go-version: "1.24"
26+
go-version: "1.25"
2727
- name: Set up tools
2828
run: |
2929
# Install ginkgo version from go.mod

0 commit comments

Comments
 (0)