Merge pull request #5733 from fluxcd/remove-workaround
Some checks failed
scan / analyze (push) Has been cancelled
update / update-components (push) Has been cancelled
conformance / conform-kubernetes (1.35.0) (push) Has been cancelled
e2e / e2e-amd64-kubernetes (push) Has been cancelled
e2e-bootstrap / e2e-boostrap-github (push) Has been cancelled
ossf / scorecard (push) Has been cancelled
conformance / conform-kubernetes (1.33.0) (push) Has been cancelled
conformance / conform-kubernetes (1.34.1) (push) Has been cancelled
conformance / conform-k3s (1.33.7) (push) Has been cancelled
conformance / conform-k3s (1.34.3) (push) Has been cancelled
conformance / conform-k3s (1.35.0) (push) Has been cancelled
conformance / conform-openshift (4.20.0-okd) (push) Has been cancelled

Remove no longer needed workaround for Flux 2.8
This commit is contained in:
Matheus Pimenta 2026-02-25 11:00:16 +00:00 committed by GitHub
commit e7314e8926
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 15 deletions

View file

@ -8,6 +8,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 }}

View file

@ -13,7 +13,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 }}

View file

@ -12,6 +12,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 }}

View file

@ -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 }}