Skip to content

Commit 69793d4

Browse files
committed
Merge branch 'main' into feat/smooth-operator/introduce-builder
2 parents bc5c640 + 450cd88 commit 69793d4

15 files changed

Lines changed: 1052 additions & 435 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ on:
2323

2424
env:
2525
OPERATOR_NAME: "airflow-operator"
26-
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2026-02-24"
26+
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2026-07-01"
2727
NIX_PKG_MANAGER_VERSION: "2.33.3"
28-
RUST_TOOLCHAIN_VERSION: "1.93.0"
28+
RUST_TOOLCHAIN_VERSION: "1.95.0"
2929
HADOLINT_VERSION: "v2.14.0"
3030
PYTHON_VERSION: "3.14"
3131
CARGO_TERM_COLOR: always

.github/workflows/pr_prek.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions: {}
1010
env:
1111
CARGO_TERM_COLOR: always
1212
NIX_PKG_MANAGER_VERSION: "2.33.3"
13-
RUST_TOOLCHAIN_VERSION: "nightly-2026-02-24"
13+
RUST_TOOLCHAIN_VERSION: "nightly-2026-07-01"
1414
HADOLINT_VERSION: "v2.14.0"
1515
JINJA2_CLI_VERSION: "1.0.0"
1616

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: detect-private-key
1616

1717
- repo: https://github.com/EmbarkStudios/cargo-deny
18-
rev: 8d76e7e991107da82c4a59cdc362a2739539f55d # 0.18.9
18+
rev: 1c9ca2b643ee15722178c1350501aabb024dd6f3 # 0.19.9
1919
hooks:
2020
- id: cargo-deny
2121
args: ["--all-features", "check", "advisories", "bans", "licenses", "sources"]
@@ -27,7 +27,7 @@ repos:
2727
args: ["--strict"]
2828

2929
- repo: https://github.com/igorshubovych/markdownlint-cli
30-
rev: 192ad822316c3a22fb3d3cc8aa6eafa0b8488360 # 0.45.0
30+
rev: a4d5d37e66ebcd6b3705204a1d6dbb56dea66338 # 0.49.0
3131
hooks:
3232
- id: markdownlint
3333
types: [text]
@@ -47,15 +47,15 @@ repos:
4747
# If you do not, you will need to delete the cached ruff binary shown in the
4848
# error message
4949
- repo: https://github.com/astral-sh/ruff-pre-commit
50-
rev: 3b4bc031619cde2e0a9f3c4441ac7cc8227245a4 # 0.14.1
50+
rev: c59bba8fb259db0fec2bbb77ad8ba51ea7341b56 # 0.15.20
5151
hooks:
5252
# Run the linter.
5353
- id: ruff-check
5454
# Run the formatter.
5555
- id: ruff-format
5656

5757
- repo: https://github.com/rhysd/actionlint
58-
rev: e7d448ef7507c20fc4c88a95d0c448b848cd6127 # 1.7.8
58+
rev: 914e7df21a07ef503a81201c76d2b11c789d3fca # 1.7.12
5959
hooks:
6060
- id: actionlint
6161

@@ -109,7 +109,7 @@ repos:
109109
- id: cargo-rustfmt
110110
name: cargo-rustfmt
111111
language: system
112-
entry: cargo +nightly-2026-02-24 fmt --all -- --check
112+
entry: cargo +nightly-2026-07-01 fmt --all -- --check
113113
stages: [pre-commit, pre-merge-commit]
114114
pass_filenames: false
115115
files: \.rs$

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"rust-analyzer.rustfmt.overrideCommand": [
33
"rustfmt",
4-
"+nightly-2026-02-24",
4+
"+nightly-2026-07-01",
55
"--edition",
66
"2024",
77
"--"

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
### Changed
1212

13+
- Bump stackable-operator to 0.113.3 ([#811]).
1314
- Document Helm deployed RBAC permissions and remove unnecessary permissions ([#767], [#774]).
1415
- BREAKING: `configOverrides` now only accepts the known config file `webserver_config.py`. Previously, arbitrary file names were silently accepted and ignored ([#775]).
1516
- Bump `stackable-operator` to 0.112.0, kube to 3.1.0, and snafu to 0.9 ([#775], [#804]).
@@ -48,6 +49,7 @@
4849
[#800]: https://github.com/stackabletech/airflow-operator/pull/800
4950
[#801]: https://github.com/stackabletech/airflow-operator/pull/801
5051
[#804]: https://github.com/stackabletech/airflow-operator/pull/804
52+
[#811]: https://github.com/stackabletech/airflow-operator/pull/811
5153

5254
## [26.3.0] - 2026-03-16
5355

0 commit comments

Comments
 (0)