From 3e0f5cdf9047ecc7b1e5fc10a70a8595021c6f90 Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 13 Feb 2026 12:59:36 +0200 Subject: [PATCH 1/2] Build with Go 1.26 Signed-off-by: Stefan Prodan --- .github/workflows/backport.yaml | 2 +- .github/workflows/cifuzz.yaml | 4 ++-- .github/workflows/e2e.yaml | 4 ++-- .github/workflows/release.yaml | 2 +- .github/workflows/scan.yaml | 2 +- .github/workflows/sync-labels.yaml | 2 +- .github/workflows/test.yaml | 4 ++-- Dockerfile | 6 +++--- Makefile | 4 ++-- go.mod | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index f67e6a946..d68536eb7 100644 --- a/.github/workflows/backport.yaml +++ b/.github/workflows/backport.yaml @@ -7,6 +7,6 @@ jobs: permissions: contents: write # for reading and creating branches. pull-requests: write # for creating pull requests against release branches. - uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.4.0 + uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.6.0 secrets: github-token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml index 16ddaa227..b0e9d8803 100644 --- a/.github/workflows/cifuzz.yaml +++ b/.github/workflows/cifuzz.yaml @@ -11,9 +11,9 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0 with: - go-version: 1.25.x + go-version: 1.26.x - name: Smoke test Fuzzers run: make fuzz-smoketest env: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 483e65ad6..79cf5e7ef 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -13,9 +13,9 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0 with: - go-version: 1.25.x + go-version: 1.26.x - name: Verify run: make verify - name: Enable integration tests diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9cc8d6e17..7e86d034d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -15,7 +15,7 @@ jobs: contents: write # for creating the GitHub release. id-token: write # for creating OIDC tokens for signing. packages: write # for pushing and signing container images. - uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.4.0 + uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.6.0 with: controller: ${{ github.event.repository.name }} release-candidate-prefix: ${{ github.event.inputs.tag }} diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml index ea8e992de..250587909 100644 --- a/.github/workflows/scan.yaml +++ b/.github/workflows/scan.yaml @@ -11,7 +11,7 @@ jobs: permissions: contents: read # for reading the repository code. security-events: write # for uploading the CodeQL analysis results. - uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.4.0 + uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.6.0 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} fossa-token: ${{ secrets.FOSSA_TOKEN }} diff --git a/.github/workflows/sync-labels.yaml b/.github/workflows/sync-labels.yaml index a4635094d..893cae3ca 100644 --- a/.github/workflows/sync-labels.yaml +++ b/.github/workflows/sync-labels.yaml @@ -11,6 +11,6 @@ jobs: permissions: contents: read # for reading the labels file. issues: write # for creating and updating labels. - uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.4.0 + uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.6.0 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c7a9aa2e8..ef9cf1ce1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.4.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0 with: - go-version: 1.25.x + go-version: 1.26.x - name: Run tests env: SKIP_COSIGN_VERIFICATION: true diff --git a/Dockerfile b/Dockerfile index 0f7c6f849..c3ecc197f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG GO_VERSION=1.25 -ARG XX_VERSION=1.6.1 +ARG GO_VERSION=1.26 +ARG XX_VERSION=1.9.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx @@ -35,7 +35,7 @@ ARG TARGETARCH ENV CGO_ENABLED=0 RUN xx-go build -trimpath -a -o source-controller main.go -FROM alpine:3.22 +FROM alpine:3.23 ARG TARGETPLATFORM RUN apk --no-cache add ca-certificates \ diff --git a/Makefile b/Makefile index 28226af5d..22eb41e36 100644 --- a/Makefile +++ b/Makefile @@ -118,8 +118,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation $(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/source.md tidy: ## Run go mod tidy - cd api; rm -f go.sum; go mod tidy -compat=1.25 - rm -f go.sum; go mod tidy -compat=1.25 + cd api; rm -f go.sum; go mod tidy -compat=1.26 + rm -f go.sum; go mod tidy -compat=1.26 fmt: ## Run go fmt against code go fmt ./... diff --git a/go.mod b/go.mod index edaa82dc4..a9fb9fdff 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller -go 1.25.5 +go 1.26.0 replace github.com/fluxcd/source-controller/api => ./api From 5a892d3c526836a34c8d43218a23588c32e339ed Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Fri, 13 Feb 2026 13:21:28 +0200 Subject: [PATCH 2/2] Update `fluxcd/pkg/auth` for ECR dualstack support Signed-off-by: Stefan Prodan --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a9fb9fdff..f3ca11c92 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/fluxcd/pkg/apis/event v0.24.0 github.com/fluxcd/pkg/apis/meta v1.25.0 github.com/fluxcd/pkg/artifact v0.8.0 - github.com/fluxcd/pkg/auth v0.38.0 + github.com/fluxcd/pkg/auth v0.38.2 github.com/fluxcd/pkg/cache v0.13.0 github.com/fluxcd/pkg/git v0.43.0 github.com/fluxcd/pkg/gittestserver v0.25.0 diff --git a/go.sum b/go.sum index 6d04d0062..d19a4d9d2 100644 --- a/go.sum +++ b/go.sum @@ -371,8 +371,8 @@ github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/ github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc= github.com/fluxcd/pkg/artifact v0.8.0 h1:9PI+jGvgZzObYQeC6Myg4j2dctAD42C0kjxvfbvdufk= github.com/fluxcd/pkg/artifact v0.8.0/go.mod h1:p3QugDJKttgI0XYI6M0Rb8pHs9Qfldh1BgVwn7GcTAU= -github.com/fluxcd/pkg/auth v0.38.0 h1:9sslEwJp2lGZKQyXU5X/AEMil8eXkApQz8AQXZM0rf0= -github.com/fluxcd/pkg/auth v0.38.0/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI= +github.com/fluxcd/pkg/auth v0.38.2 h1:AjB64oZO1Er3fxJUw1hRbN6J+2Cf0HWgZIOBE5xUtn8= +github.com/fluxcd/pkg/auth v0.38.2/go.mod h1:038UyC92mnW1mzZ/A2fHJQUpuhPkJzw39ppChuOdYfI= github.com/fluxcd/pkg/cache v0.13.0 h1:MqtlgOwIVcGKKgV422e39O+KFSVMWuExKeRaMDBjJlk= github.com/fluxcd/pkg/cache v0.13.0/go.mod h1:0xRZ1hitrIFQ6pl68ke2wZLbIqA2VLzY78HpDo9DVxs= github.com/fluxcd/pkg/git v0.43.0 h1:11LKsTHw+yx3rcGSrSbkURcdc4huUv3FxQZhHIAMofc=