From add2c7ab8e0e88c7091dec23b5cfe36bbcf75bb4 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 16:40:17 +0100 Subject: [PATCH 1/4] release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- Cargo.nix | 4 ++-- Cargo.toml | 2 +- deploy/helm/spark-k8s-operator/Chart.yaml | 4 ++-- .../examples/getting_started/getting_started.sh | 16 ++++++++-------- .../examples/getting_started/install_output.txt | 8 ++++---- docs/templating_vars.yaml | 8 ++++---- tests/release.yaml | 14 +++++++------- 9 files changed, 32 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b90aaca8..8f00336f 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 + ## [24.11.0] - 2024-11-18 ### Added diff --git a/Cargo.lock b/Cargo.lock index 625bf03c..6ae9300e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2233,7 +2233,7 @@ dependencies = [ [[package]] name = "stackable-spark-k8s-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "indoc", "product-config", @@ -2250,7 +2250,7 @@ dependencies = [ [[package]] name = "stackable-spark-k8s-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 0ae90cab..f96987b1 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6912,7 +6912,7 @@ rec { }; "stackable-spark-k8s-crd" = rec { crateName = "stackable-spark-k8s-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_spark_k8s_crd"; @@ -6973,7 +6973,7 @@ rec { }; "stackable-spark-k8s-operator" = rec { crateName = "stackable-spark-k8s-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index adfbe398..64cab77a 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/spark-k8s-operator/Chart.yaml b/deploy/helm/spark-k8s-operator/Chart.yaml index c7efbf4a..d68a9c90 100644 --- a/deploy/helm/spark-k8s-operator/Chart.yaml +++ b/deploy/helm/spark-k8s-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: spark-k8s-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 Spark-on-Kubernetes home: https://github.com/stackabletech/spark-k8s-operator maintainers: diff --git a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh index a05df99c..a1e94285 100755 --- a/docs/modules/spark-k8s/examples/getting_started/getting_started.sh +++ b/docs/modules/spark-k8s/examples/getting_started/getting_started.sh @@ -30,20 +30,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 spark-k8s-operator stackable-stable/spark-k8s-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 spark-k8s-operator stackable-stable/spark-k8s-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 \ - spark-k8s=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + spark-k8s=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/spark-k8s/examples/getting_started/install_output.txt b/docs/modules/spark-k8s/examples/getting_started/install_output.txt index 0c349c4d..c9cec90f 100644 --- a/docs/modules/spark-k8s/examples/getting_started/install_output.txt +++ b/docs/modules/spark-k8s/examples/getting_started/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 spark-k8s=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 spark-k8s=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 76e1f1e9..b4fd6d80 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 - spark: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + spark: 24.11.1-rc1 diff --git a/tests/release.yaml b/tests/release.yaml index 8012d568..1499cee7 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 spark-k8s: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 From bed65bbdf4dbabec7afef58a9cd1217d8e7b4b75 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 16:51:16 +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 9a160951f38a1d33322a7d19d00d22ca5e80a0ad Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:19:07 +0100 Subject: [PATCH 3/4] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e15ac4a6248cad6d47ec58beb9a63e1c52d (#505) 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 116cae99644d1a47576951d4270388c4a61df512 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:00:31 +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: