Skip to content

Commit d527a7b

Browse files
stefanprodanstefanprodan
authored
Merge pull request #1585 from fluxcd/go-1.26
Build with Go 1.26
2 parents 1343768 + dce5e19 commit d527a7b

11 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎.github/workflows/backport.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ jobs:
77
permissions:
88
contents: write # for reading and creating branches.
99
pull-requests: write # for creating pull requests against release branches.
10-
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.5.0
10+
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.6.0
1111
secrets:
1212
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

‎.github/workflows/cifuzz.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
contents: read # for reading the repository code.
1111
steps:
1212
- name: Test suite setup
13-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.5.0
13+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0
1414
with:
15-
go-version: 1.25.x
15+
go-version: 1.26.x
1616
- name: Smoke test Fuzzers
1717
run: make fuzz-smoketest

‎.github/workflows/e2e.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
contents: read # for reading the repository code.
1313
steps:
1414
- name: Test suite setup
15-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.5.0
15+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0
1616
with:
17-
go-version: 1.25.x
17+
go-version: 1.26.x
1818
- name: Enable integration tests
1919
# Only run integration tests for main branch
2020
if: github.ref == 'refs/heads/main'

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
contents: write # for creating the GitHub release.
1616
id-token: write # for creating OIDC tokens for signing.
1717
packages: write # for pushing and signing container images.
18-
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.5.0
18+
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.6.0
1919
with:
2020
controller: ${{ github.event.repository.name }}
2121
release-candidate-prefix: ${{ github.event.inputs.tag }}

‎.github/workflows/scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
permissions:
1212
contents: read # for reading the repository code.
1313
security-events: write # for uploading the CodeQL analysis results.
14-
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.5.0
14+
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.6.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
1717
fossa-token: ${{ secrets.FOSSA_TOKEN }}

‎.github/workflows/sync-labels.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
permissions:
1212
contents: read # for reading the labels file.
1313
issues: write # for creating and updating labels.
14-
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.5.0
14+
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.6.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG GO_VERSION=1.25
2-
ARG XX_VERSION=1.6.1
1+
ARG GO_VERSION=1.26
2+
ARG XX_VERSION=1.9.0
33

44
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
55

@@ -30,7 +30,7 @@ COPY internal/ internal/
3030
ENV CGO_ENABLED=0
3131
RUN xx-go build -trimpath -a -o kustomize-controller main.go
3232

33-
FROM alpine:3.22
33+
FROM alpine:3.23
3434

3535
ARG TARGETPLATFORM
3636

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ api-docs: gen-crd-api-reference-docs
139139

140140
# Run go mod tidy
141141
tidy:
142-
cd api; rm -f go.sum; go mod tidy -compat=1.25
143-
rm -f go.sum; go mod tidy -compat=1.25
142+
cd api; rm -f go.sum; go mod tidy -compat=1.26
143+
rm -f go.sum; go mod tidy -compat=1.26
144144

145145
# Run go fmt against code
146146
fmt:

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/kustomize-controller
22

3-
go 1.25.0
3+
go 1.26.0
44

55
replace github.com/fluxcd/kustomize-controller/api => ./api
66

@@ -24,12 +24,12 @@ require (
2424
github.com/fluxcd/pkg/apis/event v0.24.0
2525
github.com/fluxcd/pkg/apis/kustomize v1.15.0
2626
github.com/fluxcd/pkg/apis/meta v1.25.0
27-
github.com/fluxcd/pkg/auth v0.38.0
27+
github.com/fluxcd/pkg/auth v0.38.2
2828
github.com/fluxcd/pkg/cache v0.13.0
2929
github.com/fluxcd/pkg/http/fetch v0.22.0
3030
github.com/fluxcd/pkg/kustomize v1.27.0
3131
github.com/fluxcd/pkg/runtime v0.100.0
32-
github.com/fluxcd/pkg/ssa v0.67.0
32+
github.com/fluxcd/pkg/ssa v0.68.0
3333
github.com/fluxcd/pkg/tar v0.17.0
3434
github.com/fluxcd/pkg/testserver v0.13.0
3535
github.com/fluxcd/source-controller/api v1.7.2

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ github.com/fluxcd/pkg/apis/kustomize v1.15.0 h1:p8wPIxdmn0vy0a664rsE9JKCfnliZz4H
200200
github.com/fluxcd/pkg/apis/kustomize v1.15.0/go.mod h1:XWdsx8P15OiMaQIvmUjYWdmD3zAwhl5q9osl5iCqcOk=
201201
github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/eay3eA=
202202
github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc=
203-
github.com/fluxcd/pkg/auth v0.38.0 h1:9sslEwJp2lGZKQyXU5X/AEMil8eXkApQz8AQXZM0rf0=
204-
github.com/fluxcd/pkg/auth v0.38.0/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI=
203+
github.com/fluxcd/pkg/auth v0.38.2 h1:AjB64oZO1Er3fxJUw1hRbN6J+2Cf0HWgZIOBE5xUtn8=
204+
github.com/fluxcd/pkg/auth v0.38.2/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI=
205205
github.com/fluxcd/pkg/cache v0.13.0 h1:MqtlgOwIVcGKKgV422e39O+KFSVMWuExKeRaMDBjJlk=
206206
github.com/fluxcd/pkg/cache v0.13.0/go.mod h1:0xRZ1hitrIFQ6pl68ke2wZLbIqA2VLzY78HpDo9DVxs=
207207
github.com/fluxcd/pkg/envsubst v1.5.0 h1:S07mo+MkGhptdHA4pRze5HPKlc8tHxKswNdcMZi1WDY=
@@ -214,8 +214,8 @@ github.com/fluxcd/pkg/runtime v0.100.0 h1:7k2T/zlOLZ+knVr5fGB6cqq3Dr9D1k2jEe6AJo
214214
github.com/fluxcd/pkg/runtime v0.100.0/go.mod h1:SctSsHvFwUfiOVP1zirP6mo7I8wQtXeWVl2lNQWal88=
215215
github.com/fluxcd/pkg/sourceignore v0.17.0 h1:Z72nruRMhC15zIEpWoDrAcJcJ1El6QDnP/aRDfE4WOA=
216216
github.com/fluxcd/pkg/sourceignore v0.17.0/go.mod h1:3e/VmYLId0pI/H5sK7W9Ibif+j0Ahns9RxNjDMtTTfY=
217-
github.com/fluxcd/pkg/ssa v0.67.0 h1:1u7rG1JuAzaAssV/heYJy/oyDwyipRYwNfB3nOLpoRg=
218-
github.com/fluxcd/pkg/ssa v0.67.0/go.mod h1:PFXVjChubQOiWDxalpwh6PzRsEswGqnKwZB4ScoxDx4=
217+
github.com/fluxcd/pkg/ssa v0.68.0 h1:hdRFrBJO9dh04200tNJljpi4TOArHC0nq+LUFZxMgKc=
218+
github.com/fluxcd/pkg/ssa v0.68.0/go.mod h1:PFXVjChubQOiWDxalpwh6PzRsEswGqnKwZB4ScoxDx4=
219219
github.com/fluxcd/pkg/tar v0.17.0 h1:uNxbFXy8ly8C7fJ8D7w3rjTNJFrb4Hp1aY/30XkfvxY=
220220
github.com/fluxcd/pkg/tar v0.17.0/go.mod h1:b1xyIRYDD0ket4SV5u0UXYv+ZdN/O/HmIO5jZQdHQls=
221221
github.com/fluxcd/pkg/testserver v0.13.0 h1:xEpBcEYtD7bwvZ+i0ZmChxKkDo/wfQEV3xmnzVybSSg=

0 commit comments

Comments
 (0)
⚡