From 2a991efe700b6a8fa73f2f1d3a44f4eb4e94dc3f Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 16:34:41 +0100 Subject: [PATCH 1/4] release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 10 +++++----- Cargo.nix | 10 +++++----- Cargo.toml | 2 +- deploy/helm/opa-operator/Chart.yaml | 4 ++-- .../opa/examples/getting_started/getting_started.sh | 4 ++-- .../opa/examples/getting_started/install_output.txt | 2 +- docs/templating_vars.yaml | 2 +- tests/release.yaml | 8 ++++---- 9 files changed, 23 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0bd335c..fedd5b67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [24.11.1-rc1] - 2024-12-06 + ### Fixed - BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be diff --git a/Cargo.lock b/Cargo.lock index d642d111..ee73267a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2675,7 +2675,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-opa-bundle-builder" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "axum", "clap", @@ -2692,7 +2692,7 @@ dependencies = [ [[package]] name = "stackable-opa-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "derivative", "semver", @@ -2706,7 +2706,7 @@ dependencies = [ [[package]] name = "stackable-opa-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", @@ -2729,11 +2729,11 @@ dependencies = [ [[package]] name = "stackable-opa-regorule-library" -version = "24.11.0" +version = "24.11.1-rc1" [[package]] name = "stackable-opa-user-info-fetcher" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "axum", "base64 0.22.1", diff --git a/Cargo.nix b/Cargo.nix index d51bcb28..f9ae931b 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -8615,7 +8615,7 @@ rec { }; "stackable-opa-bundle-builder" = rec { crateName = "stackable-opa-bundle-builder"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { @@ -8679,7 +8679,7 @@ rec { }; "stackable-opa-crd" = rec { crateName = "stackable-opa-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_opa_crd"; @@ -8726,7 +8726,7 @@ rec { }; "stackable-opa-operator" = rec { crateName = "stackable-opa-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { @@ -8819,7 +8819,7 @@ rec { }; "stackable-opa-regorule-library" = rec { crateName = "stackable-opa-regorule-library"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/regorule-library; }; libName = "stackable_opa_regorule_library"; @@ -8830,7 +8830,7 @@ rec { }; "stackable-opa-user-info-fetcher" = rec { crateName = "stackable-opa-user-info-fetcher"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 62410444..28f83c77 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/*"] resolver = "2" [workspace.package] -version = "24.11.0" +version = "24.11.1-rc1" authors = ["Stackable GmbH "] license = "OSL-3.0" edition = "2021" diff --git a/deploy/helm/opa-operator/Chart.yaml b/deploy/helm/opa-operator/Chart.yaml index 971fc035..a5cefd5a 100644 --- a/deploy/helm/opa-operator/Chart.yaml +++ b/deploy/helm/opa-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: opa-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for OpenPolicyAgent home: https://github.com/stackabletech/opa-operator maintainers: diff --git a/docs/modules/opa/examples/getting_started/getting_started.sh b/docs/modules/opa/examples/getting_started/getting_started.sh index e2971326..1d139e49 100755 --- a/docs/modules/opa/examples/getting_started/getting_started.sh +++ b/docs/modules/opa/examples/getting_started/getting_started.sh @@ -28,13 +28,13 @@ helm repo update echo "Installing operators with Helm" # tag::helm-install-operators[] -helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.0 +helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.1-rc1 # end::helm-install-operators[] ;; "stackablectl") echo "installing operators with stackablectl" # tag::stackablectl-install-operators[] -stackablectl operator install opa=24.11.0 +stackablectl operator install opa=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/opa/examples/getting_started/install_output.txt b/docs/modules/opa/examples/getting_started/install_output.txt index 065a4471..86bcc178 100644 --- a/docs/modules/opa/examples/getting_started/install_output.txt +++ b/docs/modules/opa/examples/getting_started/install_output.txt @@ -1 +1 @@ -Installed opa=24.11.0 operator +Installed opa=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 455f1769..d30fc89b 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,4 +3,4 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - opa: 24.11.0 + opa: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index 10ce31dd..d0605fae 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 secret: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 listener: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 opa: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 From 6639e29c71a43ff3eba856534d54418e0acf0c89 Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:43:01 +0100 Subject: [PATCH 2/4] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c9cd1c39cfa56412496ea28d2bbc973cd5 (#662) Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates) --- .github/workflows/build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..a2b9ca41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ on: - trying - "renovate/**" tags: - - '[0-9][0-9].[0-9]+.[0-9]+' + - '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?' pull_request: merge_group: schedule: @@ -345,7 +345,8 @@ jobs: crate: cargo-edit bin: cargo-set-version - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step. + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the @@ -411,7 +412,8 @@ jobs: crate: cargo-edit bin: cargo-set-version - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step. + if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} - name: Build manifest list run: | From 1477b1548215e8e8d8b4aadda2a4dbbb8b35dd78 Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:19:01 +0100 Subject: [PATCH 3/4] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e15ac4a6248cad6d47ec58beb9a63e1c52d (#663) Reference-to: stackabletech/operator-templating@2b806e1 (Set PR-suffix on PRs against release branches) --- .github/workflows/build.yml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2b9ca41..2faf05fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -344,10 +344,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step. + - name: Update version if PR against main branch if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" # Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the # default value in the makefile if called from this action, but not otherwise (i.e. when called locally). @@ -411,10 +419,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - # For PRs to be merged against a release branch, the version has already been set, in which case ignore this step. + - name: Update version if PR against main branch if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }} run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }} + - name: Update version if PR against non-main branch + # For PRs to be merged against a release branch, use the version that has already been set in the calling script. + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + env: + PR_NUMBER: ${{ github.event.pull_request.number }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" + cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | # Creating manifest list From aa7fb02f376b8b142610227d7fbd42d2fdc69b3b Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:59:53 +0100 Subject: [PATCH 4/4] Update .github/workflows/build.yml Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2faf05fd..4b4abe75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,8 @@ on: - trying - "renovate/**" tags: - - '[0-9][0-9].[0-9]+.[0-9]+(-rc[0-9]+)?' + - '[0-9][0-9].[0-9]+.[0-9]+' + - '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+' pull_request: merge_group: schedule: