Merge pull request #665 from stackabletech/pr-24.11.1-rc1

release-24.11/24.11.1-rc1

Author: adwk67

.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

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]).

Cargo.lock

@@ -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 <[email protected]>"]
 license = "OSL-3.0"
 edition = "2021"

Cargo.nix

@@ -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:

Cargo.toml

@@ -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[]
 ;;
 *)

deploy/helm/druid-operator/Chart.yaml

@@ -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

docs/modules/druid/examples/getting_started/getting_started.sh

@@ -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

docs/modules/druid/examples/getting_started/install_output.txt

@@ -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