From 570ada38b84fcf7f43e94acc5be109eaeed4b74e Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 15:09:00 +0100 Subject: [PATCH 1/3] release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- Cargo.nix | 4 ++-- Cargo.toml | 2 +- deploy/helm/druid-operator/Chart.yaml | 4 ++-- .../getting_started/getting_started.sh | 24 +++++++++---------- .../getting_started/install_output.txt | 12 +++++----- docs/templating_vars.yaml | 12 +++++----- tests/release.yaml | 14 +++++------ 9 files changed, 40 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cb6f283..88b541e5 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 ([#656]). diff --git a/Cargo.lock b/Cargo.lock index bc88617e..39a1664f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2399,7 +2399,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "stackable-druid-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "indoc", "product-config", @@ -2417,7 +2417,7 @@ dependencies = [ [[package]] name = "stackable-druid-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 001986e5..00a39b39 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7381,7 +7381,7 @@ rec { }; "stackable-druid-crd" = rec { crateName = "stackable-druid-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_druid_crd"; @@ -7447,7 +7447,7 @@ rec { }; "stackable-druid-operator" = rec { crateName = "stackable-druid-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index b7d146ac..a2c00e5b 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/druid-operator/Chart.yaml b/deploy/helm/druid-operator/Chart.yaml index 1150b380..1b77b008 100644 --- a/deploy/helm/druid-operator/Chart.yaml +++ b/deploy/helm/druid-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: druid-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for Apache Druid home: https://github.com/stackabletech/druid-operator maintainers: diff --git a/docs/modules/druid/examples/getting_started/getting_started.sh b/docs/modules/druid/examples/getting_started/getting_started.sh index e41193ed..901fd39c 100755 --- a/docs/modules/druid/examples/getting_started/getting_started.sh +++ b/docs/modules/druid/examples/getting_started/getting_started.sh @@ -32,24 +32,24 @@ 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.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 zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.0 -helm install --wait hdfs-operator stackable-stable/hdfs-operator --version 24.11.0 -helm install --wait druid-operator stackable-stable/druid-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 zookeeper-operator stackable-stable/zookeeper-operator --version 24.11.1-rc1 +helm install --wait hdfs-operator stackable-stable/hdfs-operator --version 24.11.1-rc1 +helm install --wait druid-operator stackable-stable/druid-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 \ - zookeeper=24.11.0 \ - hdfs=24.11.0 \ - druid=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + zookeeper=24.11.1-rc1 \ + hdfs=24.11.1-rc1 \ + druid=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/druid/examples/getting_started/install_output.txt b/docs/modules/druid/examples/getting_started/install_output.txt index 92b64afb..c1c2888e 100644 --- a/docs/modules/druid/examples/getting_started/install_output.txt +++ b/docs/modules/druid/examples/getting_started/install_output.txt @@ -1,6 +1,6 @@ -Installed commons=24.11.0 operator -Installed secret=24.11.0 operator -Installed listener=24.11.0 operator -Installed zookeeper=24.11.0 operator -Installed hdfs=24.11.0 operator -Installed druid=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 zookeeper=24.11.1-rc1 operator +Installed hdfs=24.11.1-rc1 operator +Installed druid=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 7bf8d689..0d880c23 100644 --- a/docs/templating_vars.yaml +++ b/docs/templating_vars.yaml @@ -3,9 +3,9 @@ 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 - zookeeper: 24.11.0 - hdfs: 24.11.0 - druid: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + zookeeper: 24.11.1-rc1 + hdfs: 24.11.1-rc1 + druid: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index fc95d968..da815c6b 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,16 +7,16 @@ 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 druid: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 opa: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 From c3ec56d11d81b973634e3d14c080c6ef7cf1d5e5 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 15:28:57 +0100 Subject: [PATCH 2/3] cherrypick: workflow changes --- .github/workflows/build.yml | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..2faf05fd 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: @@ -344,9 +344,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 +419,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 From 4febb1a506e06b0daaeac38e95e74baa3287a125 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:45:29 +0100 Subject: [PATCH 3/3] 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: