From 7ccb3dc01d9a5937da9add34ce241e1c08cef27d Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <andrew.kenworthy@stackable.de>
Date: Fri, 6 Dec 2024 17:03:54 +0100
Subject: [PATCH 1/4] release 24.11.1-rc1

Signed-off-by: Andrew Kenworthy <andrew.kenworthy@stackable.de>
---
 CHANGELOG.md                                   |  2 ++
 Cargo.lock                                     |  4 ++--
 Cargo.nix                                      |  4 ++--
 Cargo.toml                                     |  2 +-
 deploy/helm/zookeeper-operator/Chart.yaml      |  4 ++--
 .../getting_started/code/getting_started.sh    | 18 +++++++++---------
 .../getting_started/code/install_output.txt    |  8 ++++----
 docs/templating_vars.yaml                      |  8 ++++----
 tests/release.yaml                             |  8 ++++----
 9 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0524d9c4..c983b188 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 fd95deb4..774f4dae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2173,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "stackable-zookeeper-crd"
-version = "24.11.0"
+version = "24.11.1-rc1"
 dependencies = [
  "serde",
  "serde_json",
@@ -2186,7 +2186,7 @@ dependencies = [
 
 [[package]]
 name = "stackable-zookeeper-operator"
-version = "24.11.0"
+version = "24.11.1-rc1"
 dependencies = [
  "anyhow",
  "built",
diff --git a/Cargo.nix b/Cargo.nix
index 452d42ef..94cf6829 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -6754,7 +6754,7 @@ rec {
       };
       "stackable-zookeeper-crd" = rec {
         crateName = "stackable-zookeeper-crd";
-        version = "24.11.0";
+        version = "24.11.1-rc1";
         edition = "2021";
         src = lib.cleanSourceWith { filter = sourceFilter;  src = ./rust/crd; };
         libName = "stackable_zookeeper_crd";
@@ -6799,7 +6799,7 @@ rec {
       };
       "stackable-zookeeper-operator" = rec {
         crateName = "stackable-zookeeper-operator";
-        version = "24.11.0";
+        version = "24.11.1-rc1";
         edition = "2021";
         crateBin = [
           {
diff --git a/Cargo.toml b/Cargo.toml
index 6cb6f372..9431c6b7 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 <info@stackable.tech>"]
 license = "OSL-3.0"
 edition = "2021"
diff --git a/deploy/helm/zookeeper-operator/Chart.yaml b/deploy/helm/zookeeper-operator/Chart.yaml
index c814ff37..eed9c818 100644
--- a/deploy/helm/zookeeper-operator/Chart.yaml
+++ b/deploy/helm/zookeeper-operator/Chart.yaml
@@ -1,8 +1,8 @@
 ---
 apiVersion: v2
 name: zookeeper-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 ZooKeeper
 home: https://github.com/stackabletech/zookeeper-operator
 maintainers:
diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
index 20d045e7..914d4a9e 100755
--- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
+++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
@@ -28,20 +28,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 zookeeper-operator stackable-stable/zookeeper-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
 # 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
+  commons=24.11.1-rc1 \
+  secret=24.11.1-rc1 \
+  listener=24.11.1-rc1 \
+  zookeeper=24.11.1-rc1
 # end::stackablectl-install-operators[]
 ;;
 *)
@@ -70,7 +70,7 @@ zkCli_ls() {
 # tag::zkcli-ls[]
 kubectl run my-pod \
   --stdin --tty --quiet --restart=Never \
-  --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.0 -- \
+  --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable24.11.1-rc1 -- \
   bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \
   kubectl logs my-pod && \
   kubectl delete pods my-pod
diff --git a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt b/docs/modules/zookeeper/examples/getting_started/code/install_output.txt
index 817686f8..e8b09ea8 100644
--- a/docs/modules/zookeeper/examples/getting_started/code/install_output.txt
+++ b/docs/modules/zookeeper/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 zookeeper=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
diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml
index 5f82bd23..1ad91bfc 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
-  zookeeper: 24.11.0
+  commons: 24.11.1-rc1
+  secret: 24.11.1-rc1
+  listener: 24.11.1-rc1
+  zookeeper: 24.11.1-rc1
diff --git a/tests/release.yaml b/tests/release.yaml
index c8e7996f..2a729986 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
       zookeeper:
-        operatorVersion: 24.11.0
+        operatorVersion: 24.11.1-rc1

From 765bde319a08b4705b5b85550f6c0dc25457b77b Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <andrew.kenworthy@stackable.de>
Date: Fri, 6 Dec 2024 17:11:18 +0100
Subject: [PATCH 2/4] initial RC workflow changes

---
 .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 18e331775d740a337576c458bf3e9da55772ec41 Mon Sep 17 00:00:00 2001
From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com>
Date: Fri, 6 Dec 2024 13:19:18 +0100
Subject: [PATCH 3/4] chore: Generated commit to update templated files since
 the last template run up to
 stackabletech/operator-templating@2b806e15ac4a6248cad6d47ec58beb9a63e1c52d
 (#896)

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 a2a8bc758fdc0a2a5f212280cc0aec45d1241efd Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com>
Date: Mon, 9 Dec 2024 12:02:13 +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: