Skip to content

Commit 1252146

Browse files
nightkrnightkr
authored
Merge branch 'main' into feature/znode-path-override
2 parents 9767600 + f6f416e commit 1252146

14 files changed

+245
-169
lines changed

‎.github/workflows/build.yml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ on:
1616
- '[0-9][0-9].[0-9]+.[0-9]+'
1717
pull_request:
1818
merge_group:
19+
schedule:
20+
# Run every Saturday morning: https://crontab.guru/#15_3_*_*_6
21+
- cron: '15 3 * * 6'
22+
workflow_dispatch:
1923

2024
env:
2125
CARGO_TERM_COLOR: always
@@ -42,7 +46,7 @@ jobs:
4246
with:
4347
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
4448
version: 1.0
45-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
49+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4650
with:
4751
submodules: recursive
4852
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
@@ -64,11 +68,11 @@ jobs:
6468
# repository: test
6569
#
6670
# - all tagged releases land in stable:
67-
# condition: github.event_name == 'create' & github.ref.startswith('refs/tags/')
71+
# condition: github.event_name == 'push' & github.ref.startswith('refs/tags/')
6872
# repository: stable
6973
#
70-
# - all pushes to main (i.e. PR-merges) land in dev:
71-
# condition: github.event_name == 'push' & github.ref == 'refs/heads/main'
74+
# - all pushes to main (i.e. PR-merges) and all scheduled/manual workflow runs on main land in dev:
75+
# condition: ( github.event_name == 'push' | github.event_name == 'schedule' | github.event_name == 'workflow_dispatch' ) & github.ref == 'refs/heads/main'
7276
# repository: dev
7377
#
7478
# Any other scenarios (e.g. when a branch is created/pushed) will cause the publish step to be skipped, most commonly this is expected to happen for the
@@ -87,10 +91,10 @@ jobs:
8791
if [[ $TRIGGER == "pull_request" ]]; then
8892
echo "exporting test as target helm repo: ${{ env.TEST_REPO_HELM_URL }}"
8993
echo "helm_repo=${{ env.TEST_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
90-
elif [[ $TRIGGER == "push" && $GITHUB_REF == "refs/heads/main" ]]; then
94+
elif [[ ( $TRIGGER == "push" || $TRIGGER == "schedule" || $TRIGGER == "workflow_dispatch" ) && $GITHUB_REF == "refs/heads/main" ]]; then
9195
echo "exporting dev as target helm repo: ${{ env.DEV_REPO_HELM_URL }}"
9296
echo "helm_repo=${{ env.DEV_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
93-
elif [[ ( $TRIGGER == "create" || $TRIGGER == "push" ) && $GITHUB_REF == refs/tags/* ]]; then
97+
elif [[ $TRIGGER == "push" && $GITHUB_REF == refs/tags/* ]]; then
9498
echo "exporting stable as target helm repo: ${{ env.STABLE_REPO_HELM_URL }}"
9599
echo "helm_repo=${{ env.STABLE_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
96100
else
@@ -111,7 +115,7 @@ jobs:
111115
continue-on-error: ${{ matrix.checks == 'advisories' }}
112116

113117
steps:
114-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
118+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
115119
with:
116120
submodules: recursive
117121
- uses: EmbarkStudios/cargo-deny-action@3f4a782664881cf5725d0ffd23969fcce89fd868 # v1.6.3
@@ -122,7 +126,7 @@ jobs:
122126
name: Run Rustfmt
123127
runs-on: ubuntu-latest
124128
steps:
125-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
129+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
126130
with:
127131
submodules: recursive
128132
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
@@ -140,7 +144,7 @@ jobs:
140144
with:
141145
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
142146
version: 1.0
143-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
147+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
144148
with:
145149
submodules: recursive
146150
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
@@ -175,7 +179,7 @@ jobs:
175179
with:
176180
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
177181
version: 1.0
178-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
182+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
179183
with:
180184
submodules: recursive
181185
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
@@ -197,7 +201,7 @@ jobs:
197201
with:
198202
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
199203
version: 1.0
200-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
204+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
201205
with:
202206
submodules: recursive
203207
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
@@ -217,7 +221,7 @@ jobs:
217221
name: Check if committed README is the one we would render from the available parts
218222
runs-on: ubuntu-latest
219223
steps:
220-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
224+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
221225
with:
222226
submodules: recursive
223227
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
@@ -255,7 +259,7 @@ jobs:
255259
with:
256260
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
257261
version: 1.0
258-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
262+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
259263
with:
260264
submodules: recursive
261265
- name: Set up Helm
@@ -324,7 +328,7 @@ jobs:
324328
with:
325329
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config
326330
version: 1.0
327-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
331+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
328332
with:
329333
submodules: recursive
330334
- uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
@@ -349,7 +353,7 @@ jobs:
349353
- name: Install cosign
350354
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
351355
- name: Install syft
352-
uses: anchore/sbom-action/download-syft@7ccf588e3cf3cc2611714c2eeae48550fbc17552 # v0.15.11
356+
uses: anchore/sbom-action/download-syft@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0
353357
- name: Build Docker image and Helm chart
354358
run: |
355359
# Installing helm on BuildJet only
@@ -388,7 +392,7 @@ jobs:
388392
- name: Install cosign
389393
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
390394
- name: Checkout
391-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
395+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
392396
with:
393397
submodules: recursive
394398
# This step checks if the current run was triggered by a push to a pr (or a pr being created).

‎.github/workflows/general_daily_security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
audit:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
17+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1818
- uses: rustsec/audit-check@dd51754d4e59da7395a4cd9b593f0ff2d61a9b95 # v1.4.1
1919
with:
2020
token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pr_reviewdog.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,60 +18,60 @@ jobs:
1818
actionlint:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
22-
- uses: reviewdog/action-actionlint@89a03f6ba8c0a9fd238e82c075ffb34b86e40291 # v1.46.0
21+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
- uses: reviewdog/action-actionlint@fd627997c9688c2f39e13917aed23873c031b834 # v1.48.0
2323
with:
2424
github_token: ${{ secrets.GITHUB_TOKEN }}
2525

2626
flake8:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
29+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3030
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # tag=v5.1.0
3131
with:
3232
python-version: "3.12"
33-
- uses: reviewdog/action-flake8@51c2708ac3e9463b4d27d0ba7d9e3ded608a6ad3 # v3.8.0
33+
- uses: reviewdog/action-flake8@99c2cfecdbc9111ec223b85b08af0e13a9a098dc # v3.10.0
3434
with:
3535
github_token: ${{ secrets.GITHUB_TOKEN }}
3636

3737
hadolint:
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
41-
- uses: reviewdog/action-hadolint@13c293e6679cd4c90fa41dd5155fb067a28c0a5f # v1.41.1
40+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
41+
- uses: reviewdog/action-hadolint@66dae8a08183f1075386da9fff19a32512ddd31f # v1.42.0
4242
with:
4343
github_token: ${{ secrets.GITHUB_TOKEN }}
4444

4545
markdownlint:
4646
runs-on: ubuntu-latest
4747
steps:
48-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
49-
- uses: reviewdog/action-markdownlint@5bc6ad5ba9e1250878f351bafcc7ac0a11dc050f # v0.18.0
48+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
49+
- uses: reviewdog/action-markdownlint@8a1ef8f946e74c4d7119ec2489069a870b2a4e8f # v0.20.0
5050
with:
5151
github_token: ${{ secrets.GITHUB_TOKEN }}
5252
markdownlint_flags: '**/*(*.md|*.md.j2)'
5353

5454
shellcheck:
5555
runs-on: ubuntu-latest
5656
steps:
57-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
58-
- uses: reviewdog/action-shellcheck@72365a51bf6476fe952a117c3ff703eb7775e40a # v1.20.0
57+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
58+
- uses: reviewdog/action-shellcheck@6e3a862f231c6895fbd335b70adef8f9243d5762 # v1.21.0
5959
with:
6060
github_token: ${{ secrets.GITHUB_TOKEN }}
6161

6262
yamllint:
6363
runs-on: ubuntu-latest
6464
steps:
65-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
66-
- uses: reviewdog/action-yamllint@8d79c3d034667db2792e328936811ed44953d691 # v1.14.0
65+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
66+
- uses: reviewdog/action-yamllint@bc37f456f657881f4a007caa6e243cef03ec8a84 # v1.15.0
6767
with:
6868
github_token: ${{ secrets.GITHUB_TOKEN }}
6969

7070
misspell:
7171
runs-on: ubuntu-latest
7272
steps:
73-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
74-
- uses: reviewdog/action-misspell@5bd7be2fc7ae56a517184f5c4bbcf2fd7afe3927 # v1.17.0
73+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
74+
- uses: reviewdog/action-misspell@8cd4a880dd86b1b175092c18c23cdec31283d654 # v1.19.0
7575
with:
7676
github_token: ${{ secrets.GITHUB_TOKEN }}
7777
locale: "US"
@@ -82,8 +82,8 @@ jobs:
8282
languagetool:
8383
runs-on: ubuntu-latest
8484
steps:
85-
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
86-
- uses: reviewdog/action-languagetool@73e4df96aa7b1b741a32ee2e1fff3405d3461583 # v1.14.0
85+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
86+
- uses: reviewdog/action-languagetool@52192aae941a664d2c51025fd113c95311ae7b65 # v1.15.0
8787
with:
8888
github_token: ${{ secrets.GITHUB_TOKEN }}
8989
level: info

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,14 @@ All notable changes to this project will be documented in this file.
1313
- Bump `built`, `clap`, `rstest`, `stackable-operator` and `strum`
1414
dependencies ([#812]).
1515

16+
### Fixed
17+
18+
- Processing of corrupted log events fixed; If errors occur, the error
19+
messages are added to the log event ([#821]).
20+
1621
[#799]: https://github.com/stackabletech/zookeeper-operator/pull/799
1722
[#812]: https://github.com/stackabletech/zookeeper-operator/pull/812
23+
[#821]: https://github.com/stackabletech/zookeeper-operator/pull/821
1824

1925
## [24.3.0] - 2024-03-20
2026

0 commit comments

Comments
 (0)