Skip to content

Commit 07f36d0

Browse files
authored
Merge pull request #1008 from fluxcd/go-1.26
Build with Go 1.26
2 parents fea0359 + a574faa commit 07f36d0

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

.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.4.0
10+
uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.6.0
1111
secrets:
1212
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
contents: read # for reading the repository code.
1212
steps:
1313
- name: Test suite setup
14-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0
14+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0
1515
with:
16-
go-version: 1.25.x
16+
go-version: 1.26.x
1717
- name: Run tests
1818
run: make test
1919
- name: Verify

.github/workflows/cifuzz.yaml

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

.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.4.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.4.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.4.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

@@ -35,7 +35,7 @@ ARG TARGETARCH
3535
ENV CGO_ENABLED=0
3636
RUN xx-go build -trimpath -a -o image-automation-controller main.go
3737

38-
FROM alpine:3.22
38+
FROM alpine:3.23
3939

4040
ARG TARGETPLATFORM
4141
RUN apk --no-cache add ca-certificates \

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
130130
$(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/v1/image-automation.md
131131

132132
tidy: ## Run go mod tidy
133-
cd api; rm -f go.sum; go mod tidy -compat=1.25
134-
rm -f go.sum; go mod tidy -compat=1.25
133+
cd api; rm -f go.sum; go mod tidy -compat=1.26
134+
rm -f go.sum; go mod tidy -compat=1.26
135135

136136
fmt: ## Run go fmt against code
137137
go fmt ./...

go.mod

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

3-
go 1.25.0
3+
go 1.26.0
44

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

@@ -20,7 +20,7 @@ require (
2020
github.com/fluxcd/pkg/apis/acl v0.9.0
2121
github.com/fluxcd/pkg/apis/event v0.24.0
2222
github.com/fluxcd/pkg/apis/meta v1.25.0
23-
github.com/fluxcd/pkg/auth v0.38.0
23+
github.com/fluxcd/pkg/auth v0.38.2
2424
github.com/fluxcd/pkg/cache v0.13.0
2525
github.com/fluxcd/pkg/git v0.43.0
2626
github.com/fluxcd/pkg/gittestserver v0.25.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/fluxcd/pkg/apis/event v0.24.0 h1:WVPf0FrJ5JExRDDGoo4W0jZgHZt0n4E48/e8
130130
github.com/fluxcd/pkg/apis/event v0.24.0/go.mod h1:Hoi4DejaNKVahGkRXqGBjT9h1aKmhc7RCYcsgoTieqc=
131131
github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/eay3eA=
132132
github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc=
133-
github.com/fluxcd/pkg/auth v0.38.0 h1:9sslEwJp2lGZKQyXU5X/AEMil8eXkApQz8AQXZM0rf0=
134-
github.com/fluxcd/pkg/auth v0.38.0/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI=
133+
github.com/fluxcd/pkg/auth v0.38.2 h1:AjB64oZO1Er3fxJUw1hRbN6J+2Cf0HWgZIOBE5xUtn8=
134+
github.com/fluxcd/pkg/auth v0.38.2/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI=
135135
github.com/fluxcd/pkg/cache v0.13.0 h1:MqtlgOwIVcGKKgV422e39O+KFSVMWuExKeRaMDBjJlk=
136136
github.com/fluxcd/pkg/cache v0.13.0/go.mod h1:0xRZ1hitrIFQ6pl68ke2wZLbIqA2VLzY78HpDo9DVxs=
137137
github.com/fluxcd/pkg/git v0.43.0 h1:11LKsTHw+yx3rcGSrSbkURcdc4huUv3FxQZhHIAMofc=

0 commit comments

Comments
 (0)