Skip to content

Commit 7f090e9

Browse files
authored
Merge pull request #1014 from fluxcd/k8s-1.34
Update to Kubernetes v1.34.0 and Go 1.25.0
2 parents ca950d1 + ed9f247 commit 7f090e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1470
-1442
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Go
1818
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1919
with:
20-
go-version: 1.24.x
20+
go-version: 1.25.x
2121
# https://github.com/actions/setup-go/blob/main/docs/adrs/0000-caching-dependencies.md#example-of-real-use-cases
2222
cache-dependency-path: |
2323
**/go.sum

.github/workflows/cifuzz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup Go
1717
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
1818
with:
19-
go-version: 1.24.x
19+
go-version: 1.25.x
2020
# https://github.com/actions/setup-go/blob/main/docs/adrs/0000-caching-dependencies.md#example-of-real-use-cases
2121
cache-dependency-path: |
2222
**/go.sum

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
if: ${{ steps.filter.outputs.git == 'true' || steps.filter.outputs.e2e == 'true' || github.event_name == 'workflow_dispatch' }}
4444
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
4545
with:
46-
go-version: 1.24.x
46+
go-version: 1.25.x
4747
# https://github.com/actions/setup-go/blob/main/docs/adrs/0000-caching-dependencies.md#example-of-real-use-cases
4848
cache-dependency-path: |
4949
**/go.sum

.github/workflows/integration-aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Setup Go
3131
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3232
with:
33-
go-version: 1.24.x
33+
go-version: 1.25.x
3434
cache-dependency-path: tests/integration/go.sum
3535
- name: Setup Terraform
3636
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2

.github/workflows/integration-azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Go
3030
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3131
with:
32-
go-version: 1.24.x
32+
go-version: 1.25.x
3333
cache-dependency-path: tests/integration/go.sum
3434
- name: Setup Terraform
3535
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2

.github/workflows/integration-cleanup.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Go
2626
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2727
with:
28-
go-version: 1.24.x
28+
go-version: 1.25.x
2929
cache-dependency-path: ./tools/reaper/go.sum
3030
- name: Setup bin dir
3131
run: mkdir -p ~/.local/bin
@@ -72,7 +72,7 @@ jobs:
7272
- name: Setup Go
7373
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
7474
with:
75-
go-version: 1.24.x
75+
go-version: 1.25.x
7676
cache-dependency-path: ./tools/reaper/go.sum
7777
- name: Authenticate to Azure
7878
uses: Azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # v1.4.6
@@ -95,7 +95,7 @@ jobs:
9595
- name: Setup Go
9696
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
9797
with:
98-
go-version: 1.24.x
98+
go-version: 1.25.x
9999
cache-dependency-path: ./tools/reaper/go.sum
100100
- name: Authenticate to AWS
101101
uses: aws-actions/configure-aws-credentials@7474bc4690e29a8392af63c5b98e7449536d5c3a # v4.3.1

.github/workflows/integration-gcp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Go
3030
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
3131
with:
32-
go-version: 1.24.x
32+
go-version: 1.25.x
3333
cache-dependency-path: tests/integration/go.sum
3434
- name: Setup Terraform
3535
uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v3.1.2

.github/workflows/scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup Go
2424
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2525
with:
26-
go-version: 1.24.x
26+
go-version: 1.25.x
2727
cache-dependency-path: |
2828
**/go.sum
2929
**/go.mod

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ PKG?=$*
1313
GO_TEST_ARGS ?= -race
1414

1515
# API generation utilities
16-
CONTROLLER_GEN_VERSION ?= v0.16.1
16+
CONTROLLER_GEN_VERSION ?= v0.19.0
1717

1818
# Architecture to use envtest with
1919
ENVTEST_ARCH ?= amd64
2020

2121
# Kubernetes versions to use envtest with
22-
ENVTEST_KUBERNETES_VERSION?=1.31
22+
ENVTEST_KUBERNETES_VERSION?=1.33
2323

2424
all: tidy generate fmt vet
2525

2626
tidy:
2727
$(MAKE) $(addprefix tidy-, $(MODULES))
2828

2929
tidy-%:
30-
cd $(subst :,/,$*); go mod tidy -compat=1.24
30+
cd $(subst :,/,$*); go mod tidy -compat=1.25
3131

3232
fmt:
3333
$(MAKE) $(addprefix fmt-, $(MODULES))

apis/acl/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/fluxcd/pkg/apis/acl
22

3-
go 1.24.0
3+
go 1.25.0

0 commit comments

Comments
 (0)