From b8d57fdbad64b3e3957c8b1abea4e15751dc6803 Mon Sep 17 00:00:00 2001 From: Matheus Pimenta Date: Wed, 25 Feb 2026 10:16:43 +0000 Subject: [PATCH] Remove no longer needed workaround for Flux 2.8 Signed-off-by: Matheus Pimenta (cherry picked from commit 7e7c7e68de3e99bf6a932822a3643ceb33c148fd) --- .github/workflows/backport.yaml | 2 +- .github/workflows/cifuzz.yaml | 2 +- .github/workflows/e2e.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/scan.yaml | 2 +- .github/workflows/sync-labels.yaml | 2 +- .github/workflows/upgrade-fluxcd-pkg.yaml | 13 +------------ 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/.github/workflows/backport.yaml b/.github/workflows/backport.yaml index dd36fee69..17743c8be 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.8.0 + uses: fluxcd/gha-workflows/.github/workflows/backport.yaml@v0.9.0 secrets: github-token: ${{ secrets.BOT_GITHUB_TOKEN }} diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml index 5829a335a..ac96de1af 100644 --- a/.github/workflows/cifuzz.yaml +++ b/.github/workflows/cifuzz.yaml @@ -11,7 +11,7 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0 with: go-version: 1.26.x - name: Smoke test Fuzzers diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a6e6c0460..f3b338d56 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -13,7 +13,7 @@ jobs: contents: read # for reading the repository code. steps: - name: Test suite setup - uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0 + uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0 with: go-version: 1.26.x - name: Run tests diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 38d398464..8812bb661 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.8.0 + uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.9.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 d22975b6c..2a7f7eef8 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.8.0 + uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.9.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 2bc98541e..5d48b6bf7 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.8.0 + uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.9.0 secrets: github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/upgrade-fluxcd-pkg.yaml b/.github/workflows/upgrade-fluxcd-pkg.yaml index 27209b6b7..659fd30ad 100644 --- a/.github/workflows/upgrade-fluxcd-pkg.yaml +++ b/.github/workflows/upgrade-fluxcd-pkg.yaml @@ -2,20 +2,9 @@ name: upgrade-fluxcd-pkg on: workflow_dispatch: - inputs: - pre-release-pkg: - description: >- - Temporary flag for Flux 2.8: use the flux/v2.8.x pkg branch for main branches - because the pkg release branch was cut before the Flux distribution release. - Remove this input once Flux 2.8.0 is released. - required: false - default: false - type: boolean jobs: upgrade-fluxcd-pkg: - uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.8.0 - with: - pre-release-pkg: ${{ inputs.pre-release-pkg }} + uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.9.0 secrets: github-token: ${{ secrets.BOT_GITHUB_TOKEN }}