Skip to content

Commit 761bcf8

Browse files
committed
Merge branch 'main' into chore/harbor-migration
2 parents 0a8b98c + d227578 commit 761bcf8

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ jobs:
356356
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
357357
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
358358
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
359-
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
359+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
360360
env:
361361
PR_NUMBER: ${{ github.event.pull_request.number }}
362362
shell: bash
@@ -440,7 +440,7 @@ jobs:
440440
# For PRs to be merged against a release branch, use the version that has already been set in the calling script.
441441
# We can't rely on cargo set-version here as we will break semver rules when changing the version to make it
442442
# specific to this PR e.g. 1.2.0 --> 1.2.0-pr678, so set it manually.
443-
if: ${{ github.event_name == 'pull_request' && github.ref != 'refs/heads/main' }}
443+
if: ${{ github.event_name == 'pull_request' && github.event.pull_request.base.ref != 'main' }}
444444
env:
445445
PR_NUMBER: ${{ github.event.pull_request.number }}
446446
shell: bash

CHANGELOG.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,20 @@ All notable changes to this project will be documented in this file.
1616
- Run a `containerdebug` process in the background of each Kafka container to collect debugging information ([#803]).
1717
- Aggregate emitted Kubernetes events on the CustomResources ([#809]).
1818

19+
[#796]: https://github.com/stackabletech/kafka-operator/pull/796
20+
[#803]: https://github.com/stackabletech/kafka-operator/pull/803
21+
[#809]: https://github.com/stackabletech/kafka-operator/pull/809
22+
[#813]: https://github.com/stackabletech/kafka-operator/pull/813
23+
24+
## [24.11.1] - 2025-01-10
25+
1926
### Fixed
2027

2128
- BREAKING: Use distinct ServiceAccounts for the Stacklets, so that multiple Stacklets can be
2229
deployed in one namespace. Existing Stacklets will use the newly created ServiceAccounts after
2330
restart ([#793]).
2431

2532
[#793]: https://github.com/stackabletech/kafka-operator/pull/793
26-
[#796]: https://github.com/stackabletech/kafka-operator/pull/796
27-
[#803]: https://github.com/stackabletech/kafka-operator/pull/803
28-
[#813]: https://github.com/stackabletech/kafka-operator/pull/813
2933

3034
## [24.11.0] - 2024-11-18
3135

examples/logging/simple-kafka-cluster-opa-log4j.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ metadata:
2525
name: simple-opa
2626
spec:
2727
image:
28-
productVersion: 0.61.0
28+
productVersion: 1.0.0
2929
servers:
3030
roleGroups:
3131
default: {}

examples/opa/simple-kafka-cluster-opa-allow-all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ metadata:
2525
name: simple-opa
2626
spec:
2727
image:
28-
productVersion: 0.61.0
28+
productVersion: 1.0.0
2929
servers:
3030
roleGroups:
3131
default: {}

0 commit comments

Comments
 (0)