From bf46f72a43367947bb523866c47ef993e2b28413 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 10 Jan 2025 14:47:03 +0100 Subject: [PATCH 1/2] release 24.11.1 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 dafa0f75..8286e1ba 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] - 2025-01-10 + ## [24.11.1-rc2] - 2024-12-12 ## [24.11.1-rc1] - 2024-12-06 diff --git a/Cargo.lock b/Cargo.lock index e279d265..d5a3b7bd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2675,7 +2675,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-opa-bundle-builder" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "axum", "clap", @@ -2692,7 +2692,7 @@ dependencies = [ [[package]] name = "stackable-opa-crd" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "derivative", "semver", @@ -2706,7 +2706,7 @@ dependencies = [ [[package]] name = "stackable-opa-operator" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "anyhow", "built", @@ -2729,11 +2729,11 @@ dependencies = [ [[package]] name = "stackable-opa-regorule-library" -version = "24.11.1-rc2" +version = "24.11.1" [[package]] name = "stackable-opa-user-info-fetcher" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "axum", "base64 0.22.1", diff --git a/Cargo.nix b/Cargo.nix index 6bf427a4..df20725f 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.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { @@ -8679,7 +8679,7 @@ rec { }; "stackable-opa-crd" = rec { crateName = "stackable-opa-crd"; - version = "24.11.1-rc2"; + version = "24.11.1"; 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.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { @@ -8819,7 +8819,7 @@ rec { }; "stackable-opa-regorule-library" = rec { crateName = "stackable-opa-regorule-library"; - version = "24.11.1-rc2"; + version = "24.11.1"; 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.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index b84bd1bf..a2c41493 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/*"] resolver = "2" [workspace.package] -version = "24.11.1-rc2" +version = "24.11.1" 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 a65e3ee0..574c12b9 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.1-rc2" -appVersion: "24.11.1-rc2" +version: "24.11.1" +appVersion: "24.11.1" 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 5bcc8787..691b2286 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.1-rc2 +helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.1 # end::helm-install-operators[] ;; "stackablectl") echo "installing operators with stackablectl" # tag::stackablectl-install-operators[] -stackablectl operator install opa=24.11.1-rc2 +stackablectl operator install opa=24.11.1 # 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 725f6625..68c593ae 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.1-rc2 operator +Installed opa=24.11.1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index e111af16..e30a25b0 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.1-rc2 + opa: 24.11.1 diff --git a/tests/release.yaml b/tests/release.yaml index 73821209..0fce33d9 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,10 +7,10 @@ releases: description: Integration test products: commons: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 secret: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 listener: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 opa: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 From cb0d24dd3a386e6fb83bfda49c54cef994ba54e2 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 10 Jan 2025 15:04:30 +0100 Subject: [PATCH 2/2] fix build action: replace cargo set-version with sed for release PRs --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4b4abe75..9217c8ce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -350,13 +350,15 @@ jobs: 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. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. 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" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml # 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). @@ -425,13 +427,15 @@ jobs: 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. + # We can't rely on cargo set-version here as we will break semver rules when changing the version to make it + # specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually. 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" + sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml - name: Build manifest list run: | # Creating manifest list