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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e21c61c..7b9b5f33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [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 cb75b930..f3de90c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "stackable-superset-crd" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "indoc", "product-config", @@ -2249,7 +2249,7 @@ dependencies = [ [[package]] name = "stackable-superset-operator" -version = "24.11.1-rc2" +version = "24.11.1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 2534fed8..c91f58da 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6912,7 +6912,7 @@ rec { }; "stackable-superset-crd" = rec { crateName = "stackable-superset-crd"; - version = "24.11.1-rc2"; + version = "24.11.1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_superset_crd"; @@ -6970,7 +6970,7 @@ rec { }; "stackable-superset-operator" = rec { crateName = "stackable-superset-operator"; - version = "24.11.1-rc2"; + version = "24.11.1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 2ca44127..1a2f0bdc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] 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/superset-operator/Chart.yaml b/deploy/helm/superset-operator/Chart.yaml index 5dce1d4e..69f51ec3 100644 --- a/deploy/helm/superset-operator/Chart.yaml +++ b/deploy/helm/superset-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: superset-operator -version: "24.11.1-rc2" -appVersion: "24.11.1-rc2" +version: "24.11.1" +appVersion: "24.11.1" description: The Stackable Operator for Apache Superset home: https://github.com/stackabletech/superset-operator maintainers: diff --git a/docs/modules/superset/examples/getting_started/getting_started.sh b/docs/modules/superset/examples/getting_started/getting_started.sh index 24c4d22b..a5cc47f8 100755 --- a/docs/modules/superset/examples/getting_started/getting_started.sh +++ b/docs/modules/superset/examples/getting_started/getting_started.sh @@ -32,20 +32,20 @@ echo "Updating Helm repo" helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc2 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc2 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc2 -helm install --wait superset-operator stackable-stable/superset-operator --version 24.11.1-rc2 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1 +helm install --wait superset-operator stackable-stable/superset-operator --version 24.11.1 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.1-rc2 \ - secret=24.11.1-rc2 \ - listener=24.11.1-rc2 \ - superset=24.11.1-rc2 + commons=24.11.1 \ + secret=24.11.1 \ + listener=24.11.1 \ + superset=24.11.1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/superset/examples/getting_started/install_output.txt b/docs/modules/superset/examples/getting_started/install_output.txt index e2cd1f9e..5f31e226 100644 --- a/docs/modules/superset/examples/getting_started/install_output.txt +++ b/docs/modules/superset/examples/getting_started/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.1-rc2 operator -Installed secret=24.11.1-rc2 operator -Installed listener=24.11.1-rc2 operator -Installed superset=24.11.1-rc2 operator +Installed commons=24.11.1 operator +Installed secret=24.11.1 operator +Installed listener=24.11.1 operator +Installed superset=24.11.1 operator diff --git a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml index c16424f9..0dd60ec1 100644 --- a/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml +++ b/docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml @@ -13,7 +13,7 @@ spec: name: config containers: - name: superset - image: docker.stackable.tech/stackable/superset:4.0.2-stackable24.11.1-rc2 + image: docker.stackable.tech/stackable/superset:4.0.2-stackable24.11.1 command: [ "/bin/sh", "-c", diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 8e3a1e9c..ab04cd2f 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,7 +3,7 @@ helm: repo_name: stackable-stable repo_url: https://repo.stackable.tech/repository/helm-stable/ versions: - commons: 24.11.1-rc2 - secret: 24.11.1-rc2 - listener: 24.11.1-rc2 - superset: 24.11.1-rc2 + commons: 24.11.1 + secret: 24.11.1 + listener: 24.11.1 + superset: 24.11.1 diff --git a/tests/release.yaml b/tests/release.yaml index 74121683..92e3daf7 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,12 +7,12 @@ 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 druid: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1 superset: - operatorVersion: 24.11.1-rc2 + operatorVersion: 24.11.1