Skip to content

Commit 032053f

Browse files
committed
Merge branch 'main' into chore/upstream-hostname
2 parents f829f15 + bd94fdb commit 032053f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1876
-689
lines changed

.github/actionlint.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
self-hosted-runner:
3+
# Ubicloud machines we are using
4+
labels:
5+
- ubicloud-standard-8-arm

.github/workflows/build.yml

Lines changed: 25 additions & 24 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
@@ -88,18 +88,18 @@ jobs:
8888
TRIGGER: ${{ github.event_name }}
8989
GITHUB_REF: ${{ github.ref }}
9090
run: |
91-
if [[ $TRIGGER == "pull_request" ]]; then
91+
if [[ "$TRIGGER" == "pull_request" ]]; then
9292
echo "exporting test as target helm repo: ${{ env.TEST_REPO_HELM_URL }}"
93-
echo "helm_repo=${{ env.TEST_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
94-
elif [[ ( $TRIGGER == "push" || $TRIGGER == "schedule" || $TRIGGER == "workflow_dispatch" ) && $GITHUB_REF == "refs/heads/main" ]]; then
93+
echo "helm_repo=${{ env.TEST_REPO_HELM_URL }}" >> "$GITHUB_OUTPUT"
94+
elif [[ ( "$TRIGGER" == "push" || "$TRIGGER" == "schedule" || "$TRIGGER" == "workflow_dispatch" ) && "$GITHUB_REF" == "refs/heads/main" ]]; then
9595
echo "exporting dev as target helm repo: ${{ env.DEV_REPO_HELM_URL }}"
96-
echo "helm_repo=${{ env.DEV_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
97-
elif [[ $TRIGGER == "push" && $GITHUB_REF == refs/tags/* ]]; then
96+
echo "helm_repo=${{ env.DEV_REPO_HELM_URL }}" >> "$GITHUB_OUTPUT"
97+
elif [[ "$TRIGGER" == "push" && $GITHUB_REF == refs/tags/* ]]; then
9898
echo "exporting stable as target helm repo: ${{ env.STABLE_REPO_HELM_URL }}"
99-
echo "helm_repo=${{ env.STABLE_REPO_HELM_URL }}" >> $GITHUB_OUTPUT
99+
echo "helm_repo=${{ env.STABLE_REPO_HELM_URL }}" >> "$GITHUB_OUTPUT"
100100
else
101101
echo "Unknown trigger and ref combination encountered, skipping publish step: $TRIGGER $GITHUB_REF"
102-
echo "helm_repo=skip" >> $GITHUB_OUTPUT
102+
echo "helm_repo=skip" >> "$GITHUB_OUTPUT"
103103
fi
104104
105105
run_cargodeny:
@@ -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
@@ -265,9 +265,9 @@ jobs:
265265
- name: Set up Helm
266266
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
267267
with:
268-
version: v3.13.3
268+
version: v3.16.1
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
@@ -310,6 +310,7 @@ jobs:
310310
matrix:
311311
runner: ["ubuntu-latest", "ubicloud-standard-8-arm"]
312312
runs-on: ${{ matrix.runner }}
313+
timeout-minutes: 120
313314
permissions:
314315
id-token: write
315316
env:
@@ -331,8 +332,8 @@ jobs:
331332
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
332333
with:
333334
submodules: recursive
334-
- uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26
335-
- uses: dtolnay/rust-toolchain@d8352f6b1d2e870bc5716e7a6d9b65c4cc244a1a
335+
- uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
336+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
336337
with:
337338
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
338339
components: rustfmt
@@ -351,9 +352,9 @@ jobs:
351352
# default value in the makefile if called from this action, but not otherwise (i.e. when called locally).
352353
# This is needed for the HELM_REPO variable.
353354
- name: Install cosign
354-
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
355+
uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
355356
- name: Install syft
356-
uses: anchore/sbom-action/download-syft@e8d2a6937ecead383dfe75190d104edd1f9c5751 # v0.16.0
357+
uses: anchore/sbom-action/download-syft@61119d458adab75f756bc0b9e4bde25725f86a7a # v0.17.2
357358
- name: Build Docker image and Helm chart
358359
run: |
359360
# Installing helm and yq on ubicloud-standard-8-arm only
@@ -379,7 +380,7 @@ jobs:
379380
- id: printtag
380381
name: Output image name and tag
381382
if: ${{ !github.event.pull_request.head.repo.fork }}
382-
run: echo "IMAGE_TAG=$(make -e print-docker-tag)" >> $GITHUB_OUTPUT
383+
run: echo "IMAGE_TAG=$(make -e print-docker-tag)" >> "$GITHUB_OUTPUT"
383384

384385
create_manifest_list:
385386
name: Build and publish manifest list
@@ -396,7 +397,7 @@ jobs:
396397
OCI_REGISTRY_SDP_CHARTS_USERNAME: "robot$sdp-charts+github-action-build"
397398
steps:
398399
- name: Install cosign
399-
uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 # v3.5.0
400+
uses: sigstore/cosign-installer@4959ce089c160fddf62f7b42464195ba1a56d382 # v3.6.0
400401
- name: Checkout
401402
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
402403
with:
@@ -437,4 +438,4 @@ jobs:
437438
ARCH_FOR_PREFLIGHT="$(arch | sed -e 's#x86_64#amd64#' | sed -e 's#aarch64#arm64#')"
438439
./preflight-linux-amd64 check container "$IMAGE_TAG" --platform "${ARCH_FOR_PREFLIGHT}" > preflight.out
439440
- name: "Passed?"
440-
run: '[ "$(cat preflight.out | jq -r .passed)" == true ]'
441+
run: '[ "$(jq -r .passed < preflight.out)" == true ]'

.github/workflows/pr_pre-commit.yaml

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,47 @@ 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:
16+
- name: Install host dependencies
17+
uses: awalsh128/cache-apt-pkgs-action@a6c3917cc929dd0345bfb2d3feaf9101823370ad # v1.4.2
18+
with:
19+
packages: protobuf-compiler krb5-user libkrb5-dev libclang-dev liblzma-dev libssl-dev pkg-config apt-transport-https
20+
version: ubuntu-latest
1121
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
12-
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
22+
with:
23+
fetch-depth: 0
24+
submodules: recursive
25+
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
1326
with:
1427
python-version: '3.12'
28+
- uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a
29+
with:
30+
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
31+
components: rustfmt,clippy
32+
- name: Setup Hadolint
33+
shell: bash
34+
run: |
35+
set -euo pipefail
36+
37+
LOCATION_DIR="$HOME/.local/bin"
38+
LOCATION_BIN="$LOCATION_DIR/hadolint"
39+
40+
SYSTEM=$(uname -s)
41+
ARCH=$(uname -m)
42+
43+
mkdir -p "$LOCATION_DIR"
44+
curl -sL -o "${LOCATION_BIN}" "https://github.com/hadolint/hadolint/releases/download/${{ env.HADOLINT_VERSION }}/hadolint-$SYSTEM-$ARCH"
45+
chmod 700 "${LOCATION_BIN}"
46+
47+
echo "$LOCATION_DIR" >> "$GITHUB_PATH"
1548
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
1649
with:
17-
extra_args: "" # Disable --all-files until we have time to fix druid/stackable/bin/run-druid
50+
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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77
### Added
88

99
- Active Directory's `samAccountName` generation can now be customized ([#454]).
10+
- Added experimental cert-manager backend ([#482]).
1011

1112
### Changed
1213

@@ -17,10 +18,18 @@ All notable changes to this project will be documented in this file.
1718
### Fixed
1819

1920
- Fixed Kerberos keytab provisioning reusing its credential cache ([#490]).
21+
- Fixed listener volumes missing a required permission to inspect manually provisioned listeners ([#497]).
22+
23+
### Changed
24+
25+
- Remove custom `h2` patch, as Kubernetes 1.26 has fixed the invalid data from Kubernetes' side. Starting with 24.11 we only support at least 1.27 (as it's needed by OpenShift 4.14) ([#495]).
2026

2127
[#454]: https://github.com/stackabletech/secret-operator/pull/454
28+
[#482]: https://github.com/stackabletech/secret-operator/pull/482
2229
[#490]: https://github.com/stackabletech/secret-operator/pull/490
2330
[#494]: https://github.com/stackabletech/secret-operator/pull/494
31+
[#495]: https://github.com/stackabletech/secret-operator/pull/495
32+
[#497]: https://github.com/stackabletech/secret-operator/pull/497
2433

2534
## [24.7.0] - 2024-07-24
2635

0 commit comments

Comments
 (0)