Skip to content

Commit 6585427

Browse files
adwk67stackable-botNickLarsenNZ
authored
release-24.11/24.11.1-rc1 (#664)
* release 24.11.1-rc1 Signed-off-by: Andrew Kenworthy <andrew.kenworthy@stackable.de> * chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@13ec44c (#662) Reference-to: stackabletech/operator-templating@13ec44c (Workflow changes in preparation for release-candidates) * chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@2b806e1 (#663) Reference-to: stackabletech/operator-templating@2b806e1 (Set PR-suffix on PRs against release branches) * Update .github/workflows/build.yml Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com> --------- Signed-off-by: Andrew Kenworthy <andrew.kenworthy@stackable.de> Co-authored-by: Stacky McStackface <95074132+stackable-bot@users.noreply.github.com> Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
1 parent cde331b commit 6585427

File tree

10 files changed

+46
-25
lines changed

10 files changed

+46
-25
lines changed

.github/workflows/build.yml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
- "renovate/**"
1515
tags:
1616
- '[0-9][0-9].[0-9]+.[0-9]+'
17+
- '[0-9][0-9].[0-9]+.[0-9]+-rc[0-9]+'
1718
pull_request:
1819
merge_group:
1920
schedule:
@@ -344,9 +345,18 @@ jobs:
344345
with:
345346
crate: cargo-edit
346347
bin: cargo-set-version
347-
- name: Update version if PR
348-
if: ${{ github.event_name == 'pull_request' }}
348+
- name: Update version if PR against main branch
349+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
349350
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
351+
- name: Update version if PR against non-main branch
352+
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
353+
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
354+
env:
355+
PR_NUMBER: ${{ github.event.pull_request.number }}
356+
run: |
357+
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
358+
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
359+
cargo set-version --offline --workspace "$PR_VERSION"
350360
351361
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
352362
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
@@ -410,9 +420,18 @@ jobs:
410420
with:
411421
crate: cargo-edit
412422
bin: cargo-set-version
413-
- name: Update version if PR
414-
if: ${{ github.event_name == 'pull_request' }}
423+
- name: Update version if PR against main branch
424+
if: ${{ github.event_name == 'pull_request' && github.ref == 'refs/heads/main' }}
415425
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
426+
- name: Update version if PR against non-main branch
427+
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
428+
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
429+
env:
430+
PR_NUMBER: ${{ github.event.pull_request.number }}
431+
run: |
432+
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
433+
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
434+
cargo set-version --offline --workspace "$PR_VERSION"
416435
- name: Build manifest list
417436
run: |
418437
# Creating manifest list

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [24.11.1-rc1] - 2024-12-06
8+
79
### Fixed
810

911
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ members = ["rust/*"]
33
resolver = "2"
44

55
[workspace.package]
6-
version = "24.11.0"
6+
version = "24.11.1-rc1"
77
authors = ["Stackable GmbH <info@stackable.tech>"]
88
license = "OSL-3.0"
99
edition = "2021"

deploy/helm/opa-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
apiVersion: v2
33
name: opa-operator
4-
version: "24.11.0"
5-
appVersion: "24.11.0"
4+
version: "24.11.1-rc1"
5+
appVersion: "24.11.1-rc1"
66
description: The Stackable Operator for OpenPolicyAgent
77
home: https://github.com/stackabletech/opa-operator
88
maintainers:

docs/modules/opa/examples/getting_started/getting_started.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ helm repo update
2828

2929
echo "Installing operators with Helm"
3030
# tag::helm-install-operators[]
31-
helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.0
31+
helm install --wait opa-operator stackable-stable/opa-operator --version 24.11.1-rc1
3232
# end::helm-install-operators[]
3333
;;
3434
"stackablectl")
3535
echo "installing operators with stackablectl"
3636
# tag::stackablectl-install-operators[]
37-
stackablectl operator install opa=24.11.0
37+
stackablectl operator install opa=24.11.1-rc1
3838
# end::stackablectl-install-operators[]
3939
;;
4040
*)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Installed opa=24.11.0 operator
1+
Installed opa=24.11.1-rc1 operator

docs/templating_vars.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ helm:
33
repo_name: stackable-stable
44
repo_url: https://repo.stackable.tech/repository/helm-stable/
55
versions:
6-
opa: 24.11.0
6+
opa: 24.11.1-rc1

tests/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ releases:
77
description: Integration test
88
products:
99
commons:
10-
operatorVersion: 24.11.0
10+
operatorVersion: 24.11.1-rc1
1111
secret:
12-
operatorVersion: 24.11.0
12+
operatorVersion: 24.11.1-rc1
1313
listener:
14-
operatorVersion: 24.11.0
14+
operatorVersion: 24.11.1-rc1
1515
opa:
16-
operatorVersion: 24.11.0
16+
operatorVersion: 24.11.1-rc1

0 commit comments

Comments
 (0)