Skip to content

Commit e64f473

Browse files
adwk67adwk67
authored
Merge pull request #558 from stackabletech/pr-24.11.1
release: 24.11.1
2 parents 108113b + 0c8c77b commit e64f473

File tree

13 files changed

+45
-39
lines changed

13 files changed

+45
-39
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,13 +350,15 @@ jobs:
350350
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
351351
- name: Update version if PR against non-main branch
352352
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
353+
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
354+
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
353355
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
354356
env:
355357
PR_NUMBER: ${{ github.event.pull_request.number }}
356358
run: |
357359
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
358360
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
359-
cargo set-version --offline --workspace "$PR_VERSION"
361+
sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml
360362
361363
# Recreate charts and publish charts and docker image. The "-e" is needed as we want to override the
362364
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
@@ -425,13 +427,15 @@ jobs:
425427
run: cargo set-version --offline --workspace 0.0.0-pr${{ github.event.pull_request.number }}
426428
- name: Update version if PR against non-main branch
427429
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
430+
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
431+
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
428432
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
429433
env:
430434
PR_NUMBER: ${{ github.event.pull_request.number }}
431435
run: |
432436
MANIFEST_VERSION=$(cargo metadata --format-version 1 --no-deps | jq -r '.packages[0].version')
433437
PR_VERSION="${MANIFEST_VERSION}-pr${PR_NUMBER}"
434-
cargo set-version --offline --workspace "$PR_VERSION"
438+
sed -i "s/version = \"${MANIFEST_VERSION}\"/version = \"${PR_VERSION}\"/" Cargo.toml
435439
- name: Build manifest list
436440
run: |
437441
# 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] - 2025-01-10
8+
79
## [24.11.1-rc2] - 2024-12-12
810

911
## [24.11.1-rc1] - 2024-12-06

‎Cargo.lock

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

‎Cargo.nix

Lines changed: 2 additions & 2 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/crd", "rust/operator-binary"]
33
resolver = "2"
44

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

‎deploy/helm/hive-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: hive-operator
4-
version: "24.11.1-rc2"
5-
appVersion: "24.11.1-rc2"
4+
version: "24.11.1"
5+
appVersion: "24.11.1"
66
description: The Stackable Operator for Apache Hive
77
home: https://github.com/stackabletech/hive-operator
88
maintainers:

‎docs/modules/hive/examples/getting_started/getting_started.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ helm repo update
3333

3434
echo "Installing Operators with Helm"
3535
# tag::helm-install-operators[]
36-
helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1-rc2
37-
helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1-rc2
38-
helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1-rc2
39-
helm install --wait hive-operator stackable-stable/hive-operator --version 24.11.1-rc2
36+
helm install --wait commons-operator stackable-stable/commons-operator --version 24.11.1
37+
helm install --wait secret-operator stackable-stable/secret-operator --version 24.11.1
38+
helm install --wait listener-operator stackable-stable/listener-operator --version 24.11.1
39+
helm install --wait hive-operator stackable-stable/hive-operator --version 24.11.1
4040
# end::helm-install-operators[]
4141

4242
echo "Install minio for S3"
@@ -75,10 +75,10 @@ if false; then
7575
echo "Installing Operators with stackablectl"
7676
# tag::stackablectl-install-operators[]
7777
stackablectl operator install \
78-
commons=24.11.1-rc2 \
79-
secret=24.11.1-rc2 \
80-
listener=24.11.1-rc2 \
81-
hive=24.11.1-rc2
78+
commons=24.11.1 \
79+
secret=24.11.1 \
80+
listener=24.11.1 \
81+
hive=24.11.1
8282
# end::stackablectl-install-operators[]
8383
fi
8484

‎docs/modules/hive/examples/getting_started/install-operator-output.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Installed commons=24.11.1-rc2 operator
2-
Installed secret=24.11.1-rc2 operator
3-
Installed listener=24.11.1-rc2 operator
4-
Installed hive=24.11.1-rc2 operator
1+
Installed commons=24.11.1 operator
2+
Installed secret=24.11.1 operator
3+
Installed listener=24.11.1 operator
4+
Installed hive=24.11.1 operator

‎docs/modules/hive/examples/getting_started/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ releases:
55
description: Demo / Test release for Hive getting started guide
66
products:
77
commons:
8-
operatorVersion: 24.11.1-rc2
8+
operatorVersion: 24.11.1
99
hive:
10-
operatorVersion: 24.11.1-rc2
10+
operatorVersion: 24.11.1
1111
listener:
12-
operatorVersion: 24.11.1-rc2
12+
operatorVersion: 24.11.1
1313
secret:
14-
operatorVersion: 24.11.1-rc2
14+
operatorVersion: 24.11.1

‎docs/templating_vars.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ helm:
33
repo_name: stackable-stable
44
repo_url: https://repo.stackable.tech/repository/helm-stable/
55
versions:
6-
commons: 24.11.1-rc2
7-
secret: 24.11.1-rc2
8-
listener: 24.11.1-rc2
9-
hive: 24.11.1-rc2
6+
commons: 24.11.1
7+
secret: 24.11.1
8+
listener: 24.11.1
9+
hive: 24.11.1
1010
minio: 4.0.2
1111
postgresql: 12.1.5

‎tests/release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ releases:
77
description: Integration test
88
products:
99
commons:
10-
operatorVersion: 24.11.1-rc2
10+
operatorVersion: 24.11.1
1111
secret:
12-
operatorVersion: 24.11.1-rc2
12+
operatorVersion: 24.11.1
1313
listener:
14-
operatorVersion: 24.11.1-rc2
14+
operatorVersion: 24.11.1
1515
zookeeper:
16-
operatorVersion: 24.11.1-rc2
16+
operatorVersion: 24.11.1
1717
hdfs:
18-
operatorVersion: 24.11.1-rc2
18+
operatorVersion: 24.11.1
1919
hive:
20-
operatorVersion: 24.11.1-rc2
20+
operatorVersion: 24.11.1

‎tests/templates/kuttl/upgrade/30-assert.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ metadata:
1010
labels:
1111
{% if test_scenario['values']['hive-old'].find(",") > 0 %}
1212
# Yes, this *might* not work with custom images, I'm sorry!
13-
app.kubernetes.io/version: "{{ test_scenario['values']['hive-old'].split(',')[0] }}-stackable24.11.1-rc2"
13+
app.kubernetes.io/version: "{{ test_scenario['values']['hive-old'].split(',')[0] }}-stackable24.11.1"
1414
{% else %}
15-
app.kubernetes.io/version: "{{ test_scenario['values']['hive-old'] }}-stackable24.11.1-rc2"
15+
app.kubernetes.io/version: "{{ test_scenario['values']['hive-old'] }}-stackable24.11.1"
1616
{% endif %}
1717
status:
1818
readyReplicas: 1

‎tests/templates/kuttl/upgrade/31-assert.yaml.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ metadata:
1010
labels:
1111
{% if test_scenario['values']['hive-old'].find(",") > 0 %}
1212
# Yes, this *might* not work with custom images, I'm sorry!
13-
app.kubernetes.io/version: "{{ test_scenario['values']['hive-new'].split(',')[0] }}-stackable24.11.1-rc2"
13+
app.kubernetes.io/version: "{{ test_scenario['values']['hive-new'].split(',')[0] }}-stackable24.11.1"
1414
{% else %}
15-
app.kubernetes.io/version: "{{ test_scenario['values']['hive-new'] }}-stackable24.11.1-rc2"
15+
app.kubernetes.io/version: "{{ test_scenario['values']['hive-new'] }}-stackable24.11.1"
1616
{% endif %}
1717
status:
1818
readyReplicas: 1

0 commit comments

Comments
 (0)