diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..4b4abe75 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,7 @@ on: - "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: @@ -344,9 +345,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - 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). @@ -410,9 +420,18 @@ jobs: with: crate: cargo-edit bin: cargo-set-version - - name: Update version if PR - if: ${{ github.event_name == 'pull_request' }} + - 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e282207..8aa4bd58 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 - Fix OIDC endpoint construction in case the `rootPath` does have a trailing slash ([#673]). diff --git a/Cargo.lock b/Cargo.lock index b0e586fc..b7a00c48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2286,7 +2286,7 @@ dependencies = [ [[package]] name = "stackable-trino-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "rstest", "semver", @@ -2301,7 +2301,7 @@ dependencies = [ [[package]] name = "stackable-trino-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.nix b/Cargo.nix index 5f5e8278..3ed7bf2f 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7050,7 +7050,7 @@ rec { }; "stackable-trino-crd" = rec { crateName = "stackable-trino-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_trino_crd"; @@ -7103,7 +7103,7 @@ rec { }; "stackable-trino-operator" = rec { crateName = "stackable-trino-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index f2e17024..7342da61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["rust/crd", "rust/operator-binary"] 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/trino-operator/Chart.yaml b/deploy/helm/trino-operator/Chart.yaml index 6124d976..d419bc61 100644 --- a/deploy/helm/trino-operator/Chart.yaml +++ b/deploy/helm/trino-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: trino-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for Trino home: https://github.com/stackabletech/trino-operator maintainers: diff --git a/docs/modules/trino/examples/getting_started/code/getting_started.sh b/docs/modules/trino/examples/getting_started/code/getting_started.sh index be06c70c..611b84cb 100755 --- a/docs/modules/trino/examples/getting_started/code/getting_started.sh +++ b/docs/modules/trino/examples/getting_started/code/getting_started.sh @@ -33,20 +33,20 @@ helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.0 -helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.0 -helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.0 -helm install --wait trino-operator stackable-stable/trino-operator --version 24.11.0 +helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc1 +helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc1 +helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc1 +helm install --wait trino-operator stackable-stable/trino-operator --version 24.11.1-rc1 # end::helm-install-operators[] ;; "stackablectl") echo "installing Operators with stackablectl" # tag::stackablectl-install-operators[] stackablectl operator install \ - commons=24.11.0 \ - secret=24.11.0 \ - listener=24.11.0 \ - trino=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + trino=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/trino/examples/getting_started/code/install_output.txt b/docs/modules/trino/examples/getting_started/code/install_output.txt index a4953c3a..8c410b20 100644 --- a/docs/modules/trino/examples/getting_started/code/install_output.txt +++ b/docs/modules/trino/examples/getting_started/code/install_output.txt @@ -1,4 +1,4 @@ -Installed commons=24.11.0 operator -Installed secret=24.11.0 operator -Installed listener=24.11.0 operator -Installed trino=24.11.0 operator +Installed commons=24.11.1-rc1 operator +Installed secret=24.11.1-rc1 operator +Installed listener=24.11.1-rc1 operator +Installed trino=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 21bb647e..51691a9a 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.0 - secret: 24.11.0 - listener: 24.11.0 - trino: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + trino: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index 7ebf544b..f128de2b 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,18 +7,18 @@ 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 zookeeper: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 hdfs: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 hive: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 opa: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 trino: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1