diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index 36cc802b..d68536eb 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.5.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 ba52480e..d7c65901 100644 --- a/.github/workflows/cifuzz.yaml +++ b/.github/workflows/cifuzz.yaml @@ -10,8 +10,8 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.5.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 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 3afe7969..3037a8de 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -12,9 +12,9 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.5.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.6.0 with: - go-version: 1.25.x + go-version: 1.26.x - name: Enable integration tests # Only run integration tests for main branch if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8b8372ef..7e86d034 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.5.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.yml b/.github/workflows/scan.yml index 371f9f0c..25058790 100644 --- a/.github/workflows/scan.yml +++ b/.github/workflows/scan.yml @@ -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.5.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 e4464c7d..893cae3c 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.5.0 + uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.6.0 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 23001c84..1da5a60a 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 @@ -30,7 +30,7 @@ COPY internal/ internal/ ENV CGO_ENABLED=0 RUN xx-go build -trimpath -a -o kustomize-controller main.go -FROM alpine:3.22 +FROM alpine:3.23 ARG TARGETPLATFORM diff --git a/Makefile b/Makefile index cf419fc9..ae881f6b 100644 --- a/Makefile +++ b/Makefile @@ -139,8 +139,8 @@ api-docs: gen-crd-api-reference-docs # Run go mod tidy 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 # Run go fmt against code fmt: diff --git a/go.mod b/go.mod index fbe9689e..b8b3a951 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/kustomize-controller -go 1.25.0 +go 1.26.0 replace github.com/fluxcd/kustomize-controller/api => ./api @@ -24,12 +24,12 @@ require ( github.com/fluxcd/pkg/apis/event v0.24.0 github.com/fluxcd/pkg/apis/kustomize v1.15.0 github.com/fluxcd/pkg/apis/meta v1.25.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/http/fetch v0.22.0 github.com/fluxcd/pkg/kustomize v1.27.0 github.com/fluxcd/pkg/runtime v0.100.0 - github.com/fluxcd/pkg/ssa v0.67.0 + github.com/fluxcd/pkg/ssa v0.68.0 github.com/fluxcd/pkg/tar v0.17.0 github.com/fluxcd/pkg/testserver v0.13.0 github.com/fluxcd/source-controller/api v1.7.2 diff --git a/go.sum b/go.sum index 6f3d7e7a..1fca7eef 100644 --- a/go.sum +++ b/go.sum @@ -200,8 +200,8 @@ github.com/fluxcd/pkg/apis/kustomize v1.15.0 h1:p8wPIxdmn0vy0a664rsE9JKCfnliZz4H github.com/fluxcd/pkg/apis/kustomize v1.15.0/go.mod h1:XWdsx8P15OiMaQIvmUjYWdmD3zAwhl5q9osl5iCqcOk= github.com/fluxcd/pkg/apis/meta v1.25.0 h1:fmZgMoe7yITGfhFqdOs7w2GOu3Y/2Vvz4+4p/eay3eA= github.com/fluxcd/pkg/apis/meta v1.25.0/go.mod h1:1D92RqAet0/n/cH5S0khBXweirHWkw9rCO0V4NCY6xc= -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/envsubst v1.5.0 h1:S07mo+MkGhptdHA4pRze5HPKlc8tHxKswNdcMZi1WDY= @@ -214,8 +214,8 @@ github.com/fluxcd/pkg/runtime v0.100.0 h1:7k2T/zlOLZ+knVr5fGB6cqq3Dr9D1k2jEe6AJo github.com/fluxcd/pkg/runtime v0.100.0/go.mod h1:SctSsHvFwUfiOVP1zirP6mo7I8wQtXeWVl2lNQWal88= github.com/fluxcd/pkg/sourceignore v0.17.0 h1:Z72nruRMhC15zIEpWoDrAcJcJ1El6QDnP/aRDfE4WOA= github.com/fluxcd/pkg/sourceignore v0.17.0/go.mod h1:3e/VmYLId0pI/H5sK7W9Ibif+j0Ahns9RxNjDMtTTfY= -github.com/fluxcd/pkg/ssa v0.67.0 h1:1u7rG1JuAzaAssV/heYJy/oyDwyipRYwNfB3nOLpoRg= -github.com/fluxcd/pkg/ssa v0.67.0/go.mod h1:PFXVjChubQOiWDxalpwh6PzRsEswGqnKwZB4ScoxDx4= +github.com/fluxcd/pkg/ssa v0.68.0 h1:hdRFrBJO9dh04200tNJljpi4TOArHC0nq+LUFZxMgKc= +github.com/fluxcd/pkg/ssa v0.68.0/go.mod h1:PFXVjChubQOiWDxalpwh6PzRsEswGqnKwZB4ScoxDx4= github.com/fluxcd/pkg/tar v0.17.0 h1:uNxbFXy8ly8C7fJ8D7w3rjTNJFrb4Hp1aY/30XkfvxY= github.com/fluxcd/pkg/tar v0.17.0/go.mod h1:b1xyIRYDD0ket4SV5u0UXYv+ZdN/O/HmIO5jZQdHQls= github.com/fluxcd/pkg/testserver v0.13.0 h1:xEpBcEYtD7bwvZ+i0ZmChxKkDo/wfQEV3xmnzVybSSg= diff --git a/tests/fuzz/Dockerfile.builder b/tests/fuzz/Dockerfile.builder index ed53283b..b36b8b78 100644 --- a/tests/fuzz/Dockerfile.builder +++ b/tests/fuzz/Dockerfile.builder @@ -1,9 +1,9 @@ FROM gcr.io/oss-fuzz-base/base-builder-go -RUN wget https://go.dev/dl/go1.25.0.linux-amd64.tar.gz \ +RUN wget https://go.dev/dl/go1.26.0.linux-amd64.tar.gz \ && mkdir temp-go \ && rm -rf /root/.go/* \ - && tar -C temp-go/ -xzf go1.25.0.linux-amd64.tar.gz \ + && tar -C temp-go/ -xzf go1.26.0.linux-amd64.tar.gz \ && mv temp-go/go/* /root/.go/ ENV SRC=$GOPATH/src/github.com/fluxcd/kustomize-controller