From fcd7fc312d1ccc1ed4b38b4d91061096a772cf81 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 6 Dec 2024 16:37:22 +0100 Subject: [PATCH 1/4] release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy --- CHANGELOG.md | 2 ++ Cargo.lock | 10 +++++----- Cargo.nix | 10 +++++----- Cargo.toml | 2 +- deploy/helm/secret-operator/Chart.yaml | 4 ++-- tests/release.yaml | 6 +++--- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 299cfb96..54fcf567 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 e05e386e..7bb0d178 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1419,7 +1419,7 @@ dependencies = [ [[package]] name = "krb5" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "krb5-sys", "snafu 0.8.5", @@ -1427,7 +1427,7 @@ dependencies = [ [[package]] name = "krb5-sys" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "bindgen 0.70.1", "pkg-config", @@ -2704,7 +2704,7 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "stackable-krb5-provision-keytab" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "byteorder", "futures 0.3.31", @@ -2774,7 +2774,7 @@ dependencies = [ [[package]] name = "stackable-secret-operator" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "anyhow", "async-trait", @@ -2813,7 +2813,7 @@ dependencies = [ [[package]] name = "stackable-secret-operator-crd-utils" -version = "24.11.0" +version = "24.11.1-rc1" dependencies = [ "serde", "stackable-operator", diff --git a/Cargo.nix b/Cargo.nix index e9593320..8336ec1c 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -4316,7 +4316,7 @@ rec { }; "krb5" = rec { crateName = "krb5"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5; }; authors = [ @@ -4336,7 +4336,7 @@ rec { }; "krb5-sys" = rec { crateName = "krb5-sys"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/krb5-sys; }; libName = "krb5_sys"; @@ -8505,7 +8505,7 @@ rec { }; "stackable-krb5-provision-keytab" = rec { crateName = "stackable-krb5-provision-keytab"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { @@ -8786,7 +8786,7 @@ rec { }; "stackable-secret-operator" = rec { crateName = "stackable-secret-operator"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; crateBin = [ { @@ -8952,7 +8952,7 @@ rec { }; "stackable-secret-operator-crd-utils" = rec { crateName = "stackable-secret-operator-crd-utils"; - version = "24.11.0"; + version = "24.11.1-rc1"; edition = "2021"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./rust/crd-utils; }; libName = "stackable_secret_operator_crd_utils"; diff --git a/Cargo.toml b/Cargo.toml index a60810df..670eda39 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["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/secret-operator/Chart.yaml b/deploy/helm/secret-operator/Chart.yaml index 8d4b3fd9..43ed3a3f 100644 --- a/deploy/helm/secret-operator/Chart.yaml +++ b/deploy/helm/secret-operator/Chart.yaml @@ -1,8 +1,8 @@ --- apiVersion: v2 name: secret-operator -version: "24.11.0" -appVersion: "24.11.0" +version: "24.11.1-rc1" +appVersion: "24.11.1-rc1" description: The Stackable Operator for Stackable Secret Operator home: https://github.com/stackabletech/secret-operator maintainers: diff --git a/tests/release.yaml b/tests/release.yaml index 061b7a9d..f62cce64 100644 --- a/tests/release.yaml +++ b/tests/release.yaml @@ -7,8 +7,8 @@ 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 From 40a7cfa2670f71f987609fdf5dad328a75fb1553 Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:43:05 +0100 Subject: [PATCH 2/4] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c9cd1c39cfa56412496ea28d2bbc973cd5 (#532) Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates) --- .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 9d5965663649326d5bdd8d7d6841d9643084c0f8 Mon Sep 17 00:00:00 2001 From: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 13:19:04 +0100 Subject: [PATCH 3/4] chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e15ac4a6248cad6d47ec58beb9a63e1c52d (#533) 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 023e685b09239ef81fbaf57d0bbc61b2e1eae01a Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:00:11 +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: