Skip to content

Commit 64eeda5

Browse files
authored
Merge pull request #5499 from fluxcd/k8s-1.34
Update to Kubernetes v1.34.0 and Go 1.25.0
2 parents 76d36cb + acdf523 commit 64eeda5

File tree

15 files changed

+386
-380
lines changed

15 files changed

+386
-380
lines changed

.github/workflows/conformance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
contents: read
1010

1111
env:
12-
GO_VERSION: 1.24.x
12+
GO_VERSION: 1.25.x
1313

1414
jobs:
1515
conform-kubernetes:

.github/workflows/e2e-azure.yaml

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

.github/workflows/e2e-bootstrap.yaml

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

.github/workflows/e2e-gcp.yaml

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

.github/workflows/e2e.yaml

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

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup Go
2727
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
2828
with:
29-
go-version: 1.24.x
29+
go-version: 1.25.x
3030
cache: false
3131
- name: Setup QEMU
3232
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0

.github/workflows/update.yaml

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

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
FROM alpine:3.21 AS builder
1+
FROM alpine:3.22 AS builder
22

33
RUN apk add --no-cache ca-certificates curl
44

55
ARG ARCH=linux/amd64
6-
ARG KUBECTL_VER=1.33.0
6+
ARG KUBECTL_VER=1.34.0
77

88
RUN curl -sL https://dl.k8s.io/release/v${KUBECTL_VER}/bin/${ARCH}/kubectl \
99
-o /usr/local/bin/kubectl && chmod +x /usr/local/bin/kubectl
1010

1111
RUN kubectl version --client=true
1212

13-
FROM alpine:3.21 AS flux-cli
13+
FROM alpine:3.22 AS flux-cli
1414

1515
RUN apk add --no-cache ca-certificates
1616

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ rwildcard=$(foreach d,$(wildcard $(addsuffix *,$(1))),$(call rwildcard,$(d)/,$(2
1717
all: test build
1818

1919
tidy:
20-
go mod tidy -compat=1.24
21-
cd tests/integration && go mod tidy -compat=1.24
20+
go mod tidy -compat=1.25
21+
cd tests/integration && go mod tidy -compat=1.25
2222

2323
fmt:
2424
go fmt ./...

cmd/flux/create_source_git_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestCreateSourceGitExport(t *testing.T) {
101101
},
102102
{
103103
name: "no args",
104-
args: "create secret git",
104+
args: "create source git --url=https://github.com/stefanprodan/podinfo",
105105
assert: assertError("name is required"),
106106
},
107107
{

0 commit comments

Comments
 (0)