diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index bdcd462..ed7b4d9 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -9,11 +9,10 @@ on: push: branches: - 'main' + - 'test-*' + - 'release-*' tags-ignore: - - 'v*' - pull_request: - branches: - - 'main' + - '*' permissions: contents: read @@ -37,10 +36,22 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Latest release id: release + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | VERSION=$(gh release view --json tagName -q '.tagName') + + branch=${{ github.ref_name }} + prefix="release-" + if [[ "${branch}" =~ ^$prefix.* ]]; then + VERSION=${branch#"$prefix"} + fi + + if [ "${{ github.event.inputs.version }}" != "" ]; then + VERSION="${{ github.event.inputs.version }}" + fi + echo "version=${VERSION}" >> $GITHUB_OUTPUT - name: Setup Flux uses: fluxcd/flux2/action@5c5c15ea212b8f029a110f9975851d25c8272695 #v2.2.2 @@ -54,13 +65,6 @@ jobs: - name: Install Flux id: install run: | - VERSION="${{ steps.release.outputs.version }}" - - if [ "${{ github.event.inputs.version }}" != "" ]; then - VERSION="${{ github.event.inputs.version }}" - fi - echo "version=${VERSION}" >> $GITHUB_OUTPUT - kubectl create ns flux-system flux create secret oci flux-enterprise-auth \ @@ -68,7 +72,7 @@ jobs: --username=${{ github.actor }} \ --password=${{ secrets.GHCR_READONLY }} - flux install --version=${VERSION} \ + flux install \ --components-extra="image-reflector-controller,image-automation-controller" \ --registry=ghcr.io/controlplaneio-fluxcd/${{ matrix.variant }} \ --image-pull-secret=flux-enterprise-auth @@ -76,7 +80,7 @@ jobs: run: kubectl -n flux-system get deployments.apps -o yaml | grep ${{ matrix.variant }} - name: Setup cluster reconciliation env: - FLUX_VERSION: ${{ steps.install.outputs.version }} + FLUX_VERSION: ${{ steps.release.outputs.version }} shell: bash run: | flux create source git flux-system \ diff --git a/releases/release-v2.2.md b/releases/release-v2.2.md index ff60aef..182e4f8 100644 --- a/releases/release-v2.2.md +++ b/releases/release-v2.2.md @@ -4,6 +4,9 @@ - [ga](#general-availability-ga) - [beta](#beta-preview) - [promotions](#promotions) +- [v2.2.1](#v221) + - [standard](#standard-v221) + - [FIPS-compliant](#fips-compliant-v221) - [v2.2.0](#v220) - [standard](#standard-v220) - [FIPS-compliant](#fips-compliant-v220) @@ -41,6 +44,49 @@ | Provider | **v1beta3** | v1beta2 | `notification.toolkit.fluxcd.io` | | HelmRelease | **v2beta2** | v2beta2 | `helm.toolkit.fluxcd.io` | + +## v2.2.1 + +Upstream changelog: [fluxcd/flux2 v2.2.1](https://github.com/fluxcd/flux2/releases/tag/v2.2.1) + +### Standard v2.2.1 + +#### Flux Controllers + +| Controller | Version | Architectures | +|:-------------------------------------------------------------------|---------|---------------| +| `ghcr.io/controlplaneio-fluxcd/alpine/source-controller` | v1.2.3 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/alpine/kustomize-controller` | v1.2.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/alpine/helm-controller` | v0.37.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/alpine/notification-controller` | v1.2.3 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/alpine/image-reflector-controller` | v0.31.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/alpine/image-automation-controller` | v0.37.0 | amd64 / arm64 | + +#### Flux Manifests + +| OCI Artifact | Version | +|:------------------------------------------------------|---------| +| `ghcr.io/controlplaneio-fluxcd/alpine/flux-manifests` | v2.2.1 | + +### FIPS-compliant v2.2.1 + +#### Flux Controllers + +| Controller | Version | Architectures | +|:------------------------------------------------------------------------|---------|---------------| +| `ghcr.io/controlplaneio-fluxcd/distroless/source-controller` | v1.2.3 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/distroless/kustomize-controller` | v1.2.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/distroless/helm-controller` | v0.37.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/distroless/notification-controller` | v1.2.3 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/distroless/image-reflector-controller` | v0.31.1 | amd64 / arm64 | +| `ghcr.io/controlplaneio-fluxcd/distroless/image-automation-controller` | v0.37.0 | amd64 / arm64 | + +#### Flux Manifests + +| OCI Artifact | Version | +|:-----------------------------------------------------------|---------| +| `ghcr.io/controlplaneio-fluxcd/distroless/flux-manifests` | v2.2.1 | + ## v2.2.0 Upstream changelog: [fluxcd/flux2 v2.2.0](https://github.com/fluxcd/flux2/releases/tag/v2.2.0)