From 1cceba329cab394497507efe80fb3a856424c946 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 5 Dec 2024 13:11:40 +0100 Subject: [PATCH 1/7] release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- Cargo.nix | 4 ++-- Cargo.toml | 2 +- deploy/helm/airflow-operator/Chart.yaml | 4 ++-- .../getting_started/code/getting_started.sh | 16 ++++++++-------- .../getting_started/code/install_output.txt | 8 ++++---- docs/templating_vars.yaml | 8 ++++---- tests/release.yaml | 10 +++++----- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a875db..ef386ed3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +## [24.11.1-rc1] - 2024-12-05 + ### Fixed - BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be diff --git a/Cargo.lock b/Cargo.lock index c5d93069..192ddee0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2172,7 +2172,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-airflow-crd" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "indoc", "product-config", @@ -2189,7 +2189,7 @@ dependencies = [ [[package]] name = "stackable-airflow-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "built", diff --git a/Cargo.nix b/Cargo.nix index 4e6ba474..b0296939 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -6677,7 +6677,7 @@ rec { }; "stackable-airflow-crd" = rec { crateName = "stackable-airflow-crd"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd; }; libName = "stackable_airflow_crd"; @@ -6739,7 +6739,7 @@ rec { }; "stackable-airflow-operator" = rec { crateName = "stackable-airflow-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { diff --git a/Cargo.toml b/Cargo.toml index 4a0c47ec..39751a07 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/airflow-operator/Chart.yaml b/deploy/helm/airflow-operator/Chart.yaml index 5ecbdd6e..5e5e953e 100644 --- a/deploy/helm/airflow-operator/Chart.yaml +++ b/deploy/helm/airflow-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: airflow-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 Airflow home: https://github.com/stackabletech/airflow-operator maintainers: diff --git a/docs/modules/airflow/examples/getting_started/code/getting_started.sh b/docs/modules/airflow/examples/getting_started/code/getting_started.sh index 4de30ff6..20c5ad75 100755 --- a/docs/modules/airflow/examples/getting_started/code/getting_started.sh +++ b/docs/modules/airflow/examples/getting_started/code/getting_started.sh @@ -44,20 +44,20 @@ 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 airflow-operator stackable-stable/airflow-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 airflow-operator stackable-stable/airflow-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 \ - airflow=24.11.0 + commons=24.11.1-rc1 \ + secret=24.11.1-rc1 \ + listener=24.11.1-rc1 \ + airflow=24.11.1-rc1 # end::stackablectl-install-operators[] ;; *) diff --git a/docs/modules/airflow/examples/getting_started/code/install_output.txt b/docs/modules/airflow/examples/getting_started/code/install_output.txt index 380df58f..c8942cb3 100644 --- a/docs/modules/airflow/examples/getting_started/code/install_output.txt +++ b/docs/modules/airflow/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 airflow=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 airflow=24.11.1-rc1 operator diff --git a/docs/templating_vars.yaml b/docs/templating_vars.yaml index 4e5b013a..ce0f9f71 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 - airflow: 24.11.0 + commons: 24.11.1-rc1 + secret: 24.11.1-rc1 + listener: 24.11.1-rc1 + airflow: 24.11.1-rc1 postgresql: 12.1.5 redis: 17.3.7 diff --git a/tests/release.yaml b/tests/release.yaml index d9526d12..4287fda2 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,12 +7,12 @@ 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 airflow: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 spark-k8s: - operatorVersion: 24.11.0 + operatorVersion: 24.11.1-rc1 From a3d27b913e03ada54db79abdda2e7c87b27071e8 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 5 Dec 2024 14:12:44 +0100 Subject: [PATCH 2/7] wip: extend regex --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f67bc74..3bb419f1 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: @@ -25,7 +25,7 @@ env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: '0' CARGO_PROFILE_DEV_DEBUG: '0' - RUST_TOOLCHAIN_VERSION: "1.81.0" + RUST_TOOLCHAIN_VERSION: "1.82.0" RUSTFLAGS: "-D warnings" RUSTDOCFLAGS: "-D warnings" RUST_LOG: "info" From bf3d163e6a014826b814d7fd0836b2997ef80bf4 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 5 Dec 2024 14:30:20 +0100 Subject: [PATCH 3/7] wip: set version --- .github/workflows/build.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bb419f1..f68ea341 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -344,9 +344,15 @@ 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 + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.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 +416,15 @@ 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 + if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} + run: | + MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') + PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}" + cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | # Creating manifest list From 89c386a7b8629a178b2784cb2c73e861a9d2be39 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 5 Dec 2024 14:50:45 +0100 Subject: [PATCH 4/7] add PR as package info suffix --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f68ea341..eb900aae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,7 +351,7 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') - PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}" + PR_VERSION="${MANIFEST_VERSION}+pr${{ github.event.pull_request.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 @@ -423,7 +423,7 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') - PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}" + PR_VERSION="${MANIFEST_VERSION}+pr${{ github.event.pull_request.number }}" cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | From a59842479dbff8cb7548f78de34ca14280b033eb Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Thu, 5 Dec 2024 16:22:46 +0100 Subject: [PATCH 5/7] revert:add PR as package info suffix --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eb900aae..f68ea341 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,7 +351,7 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') - PR_VERSION="${MANIFEST_VERSION}+pr${{ github.event.pull_request.number }}" + PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.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 @@ -423,7 +423,7 @@ jobs: if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }} run: | MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version') - PR_VERSION="${MANIFEST_VERSION}+pr${{ github.event.pull_request.number }}" + PR_VERSION="${MANIFEST_VERSION}-pr${{ github.event.pull_request.number }}" cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | From 25bb9f63fc290914f97e8f0d8e87bb4c60ce01a0 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 10:33:31 +0100 Subject: [PATCH 6/7] use env for PR number --- .github/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f68ea341..61a50f51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -348,10 +348,13 @@ jobs: 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${{ github.event.pull_request.number }}" + 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 @@ -420,10 +423,13 @@ jobs: 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${{ github.event.pull_request.number }}" + PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}" cargo set-version --offline --workspace "$PR_VERSION" - name: Build manifest list run: | From d206e816c477a600341b296be99ff7fdb49eae21 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 14:46:40 +0100 Subject: [PATCH 7/7] revert to rust 1.81 as not part of 24.11.1-rc1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61a50f51..2faf05fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: '0' CARGO_PROFILE_DEV_DEBUG: '0' - RUST_TOOLCHAIN_VERSION: "1.82.0" + RUST_TOOLCHAIN_VERSION: "1.81.0" RUSTFLAGS: "-D warnings" RUSTDOCFLAGS: "-D warnings" RUST_LOG: "info"