Skip to content

Commit 8773940

Browse files
authored
Merge pull request #873 from fluxcd/backport-872-to-release/v1.1.x
[release/v1.1.x] Remove no longer needed workaround for Flux 2.8
2 parents 588857a + f06446e commit 8773940

File tree

10 files changed

+10
-21
lines changed

10 files changed

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

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: read # for reading the repository code.
1313
steps:
1414
- name: Test suite setup
15-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0
15+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0
1616
with:
1717
go-version: 1.26.x
1818
- name: Run tests

.github/workflows/cifuzz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
contents: read # for reading the repository code.
1111
steps:
1212
- name: Test suite setup
13-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0
13+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0
1414
with:
1515
go-version: 1.26.x
1616
- name: Smoke test Fuzzers

.github/workflows/integration-aws.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
working-directory: ./tests/integration
1313
steps:
1414
- name: Test suite setup
15-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0
15+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0
1616
with:
1717
go-version: 1.26.x
1818
- name: Setup Terraform

.github/workflows/integration-azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
working-directory: ./tests/integration
1313
steps:
1414
- name: Test suite setup
15-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0
15+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0
1616
with:
1717
go-version: 1.26.x
1818
- name: Setup Terraform

.github/workflows/integration-gcp.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
working-directory: ./tests/integration
1313
steps:
1414
- name: Test suite setup
15-
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.8.0
15+
uses: fluxcd/gha-workflows/.github/actions/setup-kubernetes@v0.9.0
1616
with:
1717
go-version: 1.26.x
1818
- name: Setup Terraform

.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.8.0
18+
uses: fluxcd/gha-workflows/.github/workflows/controller-release.yaml@v0.9.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.8.0
14+
uses: fluxcd/gha-workflows/.github/workflows/code-scan.yaml@v0.9.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.8.0
14+
uses: fluxcd/gha-workflows/.github/workflows/labels-sync.yaml@v0.9.0
1515
secrets:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/upgrade-fluxcd-pkg.yaml

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,9 @@ name: upgrade-fluxcd-pkg
22

33
on:
44
workflow_dispatch:
5-
inputs:
6-
pre-release-pkg:
7-
description: >-
8-
Temporary flag for Flux 2.8: use the flux/v2.8.x pkg branch for main branches
9-
because the pkg release branch was cut before the Flux distribution release.
10-
Remove this input once Flux 2.8.0 is released.
11-
required: false
12-
default: false
13-
type: boolean
145

156
jobs:
167
upgrade-fluxcd-pkg:
17-
uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.8.0
18-
with:
19-
pre-release-pkg: ${{ inputs.pre-release-pkg }}
8+
uses: fluxcd/gha-workflows/.github/workflows/upgrade-fluxcd-pkg.yaml@v0.9.0
209
secrets:
2110
github-token: ${{ secrets.BOT_GITHUB_TOKEN }}

0 commit comments

Comments
 (0)