Skip to content

Commit d7b879f

Browse files
fhennigfhennig
authored
Merge branch 'main' into add-descriptions
2 parents 001bb39 + dd993c1 commit d7b879f

File tree

10 files changed

+91
-37
lines changed

10 files changed

+91
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
CARGO_TERM_COLOR: always
2626
CARGO_INCREMENTAL: '0'
2727
CARGO_PROFILE_DEV_DEBUG: '0'
28-
RUST_TOOLCHAIN_VERSION: "1.80.0"
28+
RUST_TOOLCHAIN_VERSION: "1.80.1"
2929
RUSTFLAGS: "-D warnings"
3030
RUSTDOCFLAGS: "-D warnings"
3131
RUST_LOG: "info"
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5050
with:
5151
submodules: recursive
52-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
52+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
5353
with:
5454
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
5555
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
@@ -118,7 +118,7 @@ jobs:
118118
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
119119
with:
120120
submodules: recursive
121-
- uses: EmbarkStudios/cargo-deny-action@3f4a782664881cf5725d0ffd23969fcce89fd868 # v1.6.3
121+
- uses: EmbarkStudios/cargo-deny-action@8371184bd11e21dcf8ac82ebf8c9c9f74ebf7268 # v2.0.1
122122
with:
123123
command: check ${{ matrix.checks }}
124124

@@ -129,7 +129,7 @@ jobs:
129129
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
130130
with:
131131
submodules: recursive
132-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
132+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
133133
with:
134134
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
135135
components: rustfmt
@@ -147,7 +147,7 @@ jobs:
147147
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
148148
with:
149149
submodules: recursive
150-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
150+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
151151
with:
152152
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
153153
components: clippy
@@ -182,7 +182,7 @@ jobs:
182182
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
183183
with:
184184
submodules: recursive
185-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
185+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
186186
with:
187187
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
188188
components: rustfmt
@@ -204,7 +204,7 @@ jobs:
204204
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
205205
with:
206206
submodules: recursive
207-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
207+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
208208
with:
209209
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
210210
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
@@ -224,7 +224,7 @@ jobs:
224224
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
225225
with:
226226
submodules: recursive
227-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
227+
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
228228
with:
229229
python-version: '3.12'
230230
- name: Install jinja2-cli
@@ -267,7 +267,7 @@ jobs:
267267
with:
268268
version: v3.13.3
269269
- name: Set up cargo
270-
uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
270+
uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
271271
with:
272272
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
273273
- uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
@@ -331,8 +331,8 @@ jobs:
331331
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
332332
with:
333333
submodules: recursive
334-
- uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
335-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
334+
- uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
335+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
336336
with:
337337
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
338338
components: rustfmt
@@ -351,9 +351,9 @@ jobs:
351351
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
352352
# This is needed for the HELM_REPO variable.
353353
- name: Install cosign
354-
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
354+
uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
355355
- name: Install syft
356-
uses: anchore/sbom-action/download-syft@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0
356+
uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2
357357
- name: Build Docker image and Helm chart
358358
run: |
359359
# Installing helm and yq on ubicloud-standard-8-arm only
@@ -396,7 +396,7 @@ jobs:
396396
OCI_REGISTRY_SDP_CHARTS_USERNAME: "robot$sdp-charts+github-action-build"
397397
steps:
398398
- name: Install cosign
399-
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
399+
uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
400400
- name: Checkout
401401
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
402402
with:

‎.github/workflows/pr_pre-commit.yaml‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,41 @@ name: pre-commit
44
on:
55
pull_request:
66

7+
env:
8+
CARGO_TERM_COLOR: always
9+
RUST_TOOLCHAIN_VERSION: "1.80.1"
10+
HADOLINT_VERSION: "v2.12.0"
11+
712
jobs:
813
pre-commit:
914
runs-on: ubuntu-latest
1015
steps:
1116
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
12-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
17+
with:
18+
fetch-depth: 0
19+
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
1320
with:
1421
python-version: '3.12'
22+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
23+
with:
24+
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
25+
components: rustfmt,clippy
26+
- name: Setup Hadolint
27+
shell: bash
28+
run: |
29+
set -euo pipefail
30+
31+
LOCATION_DIR="$HOME/.local/bin"
32+
LOCATION_BIN="$LOCATION_DIR/hadolint"
33+
34+
SYSTEM=$(uname -s)
35+
ARCH=$(uname -m)
36+
37+
mkdir -p "$LOCATION_DIR"
38+
curl -sL -o "${LOCATION_BIN}" "https://github.com/hadolint/hadolint/releases/download/${{ env.HADOLINT_VERSION }}/hadolint-$SYSTEM-$ARCH"
39+
chmod 700 "${LOCATION_BIN}"
40+
41+
echo "$LOCATION_DIR" >> "$GITHUB_PATH"
1542
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
1643
with:
17-
extra_args: "" # Disable --all-files until we have time to fix druid/stackable/bin/run-druid
44+
extra_args: "--from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}"

‎.pre-commit-config.yaml‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
22
exclude: ^(Cargo\.nix|crate-hashes\.json|nix/.*)$
33

4-
# See https://pre-commit.com for more information
5-
# See https://pre-commit.com/hooks.html for more hooks
4+
default_language_version:
5+
node: system
6+
67
repos:
78
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v4.6.0
9+
rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # 4.6.0
910
hooks:
1011
- id: trailing-whitespace
1112
- id: end-of-file-fixer
@@ -14,27 +15,27 @@ repos:
1415
- id: detect-private-key
1516

1617
- repo: https://github.com/doublify/pre-commit-rust
17-
rev: v1.0
18+
rev: eeee35a89e69d5772bdee97db1a6a898467b686e # 1.0
1819
hooks:
1920
- id: fmt
2021
args: ["--all", "--", "--check"]
2122
- id: clippy
2223
args: ["--all-targets", "--", "-D", "warnings"]
2324

2425
- repo: https://github.com/adrienverge/yamllint
25-
rev: v1.35.1
26+
rev: 81e9f98ffd059efe8aa9c1b1a42e5cce61b640c6 # 1.35.1
2627
hooks:
2728
- id: yamllint
2829

2930
- repo: https://github.com/igorshubovych/markdownlint-cli
30-
rev: v0.40.0
31+
rev: f295829140d25717bc79368d3f966fc1f67a824f # 0.41.0
3132
hooks:
3233
- id: markdownlint
3334
types: [text]
3435
files: \.md(\.j2)*$
3536

3637
- repo: https://github.com/koalaman/shellcheck-precommit
37-
rev: v0.10.0
38+
rev: 2491238703a5d3415bb2b7ff11388bf775372f29 # 0.10.0
3839
hooks:
3940
- id: shellcheck
4041
args: ["--severity=info"]
@@ -43,13 +44,23 @@ repos:
4344
# If you do not, you will need to delete the cached ruff binary shown in the
4445
# error message
4546
- repo: https://github.com/astral-sh/ruff-pre-commit
46-
rev: v0.5.1
47+
rev: f1ebc5730d98440041cc43e4d69829ad598ae1e7 # 0.6.3
4748
hooks:
4849
# Run the linter.
4950
- id: ruff
5051
# Run the formatter.
5152
- id: ruff-format
5253

54+
- repo: https://github.com/rhysd/actionlint
55+
rev: 62dc61a45fc95efe8c800af7a557ab0b9165d63b # 1.7.1
56+
hooks:
57+
- id: actionlint
58+
59+
- repo: https://github.com/hadolint/hadolint
60+
rev: b3555ba9c2bfd9401e79f2f0da68dd1ae38e10c7 # 2.12.0
61+
hooks:
62+
- id: hadolint
63+
5364
- repo: local
5465
hooks:
5566
- id: regenerate-charts

‎.vscode/launch.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"type": "lldb",
6+
"request": "launch",
7+
"name": "Debug operator binary",
8+
"cargo": {
9+
"args": ["build"],
10+
"filter": {
11+
"name": "stackable-{[ operator.name }]",
12+
"kind": "bin"
13+
}
14+
},
15+
"args": ["run"],
16+
"cwd": "${workspaceFolder}"
17+
}
18+
]
19+
}

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ All notable changes to this project will be documented in this file.
1010
- `podOverrides`
1111
- `affinity`
1212

13+
### Removed
14+
15+
- Remove ZooKeeper 3.8.4 from tests and docs ([#857]).
16+
1317
[#853]: https://github.com/stackabletech/zookeeper-operator/pull/853
18+
[#857]: https://github.com/stackabletech/zookeeper-operator/pull/857
1419

1520
## [24.7.0] - 2024-07-24
1621

‎deny.toml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[graph]
12
targets = [
23
{ triple = "x86_64-unknown-linux-gnu" },
34
{ triple = "aarch64-unknown-linux-gnu" },
@@ -7,20 +8,13 @@ targets = [
78
]
89

910
[advisories]
10-
vulnerability = "warn"
11-
unmaintained = "allow"
12-
unsound = "warn"
13-
yanked = "warn"
14-
notice = "warn"
11+
yanked = "deny"
1512

1613
[bans]
1714
multiple-versions = "allow"
1815

1916
[licenses]
20-
unlicensed = "deny"
21-
copyleft = "deny"
22-
allow-osi-fsf-free = "neither"
23-
default = "deny"
17+
unused-allowed-license = "allow"
2418
confidence-threshold = 1.0
2519
allow = [
2620
"Apache-2.0",

‎docs/modules/zookeeper/partials/supported-versions.adoc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
// This is a separate file, since it is used by both the direct ZooKeeper documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
- 3.8.4 (deprecated)
65
- 3.9.2 (LTS)

‎renovate.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"extends": [
44
"local>stackabletech/.github:renovate-config"
55
],
6-
"ignorePaths": [".github/workflows/build.yml", ".github/workflows/general_daily_security.yml", ".github/workflows/pr_pre-commit.yaml", ".github/workflows/pr_reviewdog.yaml"]
6+
"ignorePaths": [".github/workflows/build.yml", ".github/workflows/general_daily_security.yml", ".github/workflows/pr_pre-commit.yaml"]
77
}

‎rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# DO NOT EDIT, this file is generated by operator-templating
22
[toolchain]
3-
channel = "1.80.0"
3+
channel = "1.80.1"

‎tests/test-definition.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
dimensions:
33
- name: zookeeper
44
values:
5-
- 3.8.4
65
- 3.9.2
76
- name: zookeeper-latest
87
values:

0 commit comments

Comments
 (0)