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 e689be80..098c2a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [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 8babf975..2d118d3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2172,7 +2172,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-hbase-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "indoc", "product-config", @@ -2188,7 +2188,7 @@ dependencies = [ [[package]] name = "stackable-hbase-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index c0b55cf7..53d3bdc3 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6678,7 +6678,7 @@ rec { }; "stackable-hbase-crd" = rec { crateName = "stackable-hbase-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_hbase_crd"; @@ -6735,7 +6735,7 @@ rec { }; "stackable-hbase-operator" = rec { crateName = "stackable-hbase-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 70690761..23948e91 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/hbase-operator/Chart.yaml b/deploy/helm/hbase-operator/Chart.yaml index 98f08369..39428cf4 100644 --- a/deploy/helm/hbase-operator/Chart.yaml +++ b/deploy/helm/hbase-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: hbase-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 HBase home: https://github.com/stackabletech/hbase-operator maintainers: diff --git a/docs/modules/hbase/examples/getting_started/getting_started.sh b/docs/modules/hbase/examples/getting_started/getting_started.sh index 195b9c84..948466e7 100755 --- a/docs/modules/hbase/examples/getting_started/getting_started.sh +++ b/docs/modules/hbase/examples/getting_started/getting_started.sh @@ -27,12 +27,12 @@ echo "Updating Helm repo" helm repo update echo "Installing Operators with Helm" # tag::helm-install-operators[] -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 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 hbase-operator stackable-stable/hbase-operator --version 24.11.0 & +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 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 hbase-operator stackable-stable/hbase-operator --version 24.11.1-rc1 & wait # end::helm-install-operators[] ;; @@ -40,12 +40,12 @@ wait 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 \ - hbase=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 \ + hbase=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/hbase/examples/getting_started/install_output.txt b/docs/modules/hbase/examples/getting_started/install_output.txt index aca7211c..5c41c3f6 100644 --- a/docs/modules/hbase/examples/getting_started/install_output.txt +++ b/docs/modules/hbase/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 hbase=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 hbase=24.11.1-rc1 operator diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml index 700ed42a..2b4d5469 100644 --- a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml +++ b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbck2 - image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.0 + image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.1-rc1 volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml index d52143a4..af07c903 100644 --- a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml +++ b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml @@ -8,7 +8,7 @@ spec: spec: containers: - name: hbase - image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.0 + image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.1-rc1 volumeMounts: - name: hbase-config mountPath: /stackable/conf diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 1075609a..64703e5e 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 - hbase: 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 + hbase: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index 5e99018e..24da5ea4 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 hbase: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 opa: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1