Skip to content

Commit c9c9b28

Browse files
committed
Merge branch 'main' into feature/loadbalancerclass
This also updates operator-rs to 0.92.0, but *does not* consider the new changes in there.
2 parents 9fb4560 + 0f1f40f commit c9c9b28

File tree

29 files changed

+3585
-1177
lines changed

29 files changed

+3585
-1177
lines changed

.github/PULL_REQUEST_TEMPLATE/pre-release-rust-deps.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Bump Rust Dependencies for Stackable Release XX.(X)X
1+
# Bump Rust Dependencies for Stackable Release YY.M.X
22

33
<!--
44
Make sure to update the link in 'issues/.github/ISSUE_TEMPLATE/pre-release-operator-rust-deps.md'
@@ -32,7 +32,7 @@ Part of <https://github.com/stackabletech/issues/issues/TRACKING_ISSUE>
3232
3333
```[tasklist]
3434
### Bump Rust Dependencies
35-
- [ ] Bump `stackable-operator` and friends.
36-
- [ ] Bump `product-version`.
37-
- [ ] Bump all other dependencies.
35+
- [ ] Bump `stackable-operator` and friends
36+
- [ ] Bump `product-config`
37+
- [ ] Bump all other dependencies
3838
```

.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ env:
2626
CARGO_TERM_COLOR: always
2727
CARGO_INCREMENTAL: '0'
2828
CARGO_PROFILE_DEV_DEBUG: '0'
29-
RUST_TOOLCHAIN_VERSION: "1.84.1"
29+
RUST_TOOLCHAIN_VERSION: "1.85.0"
30+
RUST_NIGHTLY_TOOLCHAIN_VERSION: "nightly-2025-01-15"
3031
PYTHON_VERSION: "3.12"
3132
RUSTFLAGS: "-D warnings"
3233
RUSTDOCFLAGS: "-D warnings"
@@ -136,9 +137,11 @@ jobs:
136137
submodules: recursive
137138
- uses: dtolnay/rust-toolchain@c5a29ddb4d9d194e7c84ec8c3fba61b1c31fee8c
138139
with:
139-
toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }}
140+
toolchain: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
140141
components: rustfmt
141-
- run: cargo fmt --all -- --check
142+
- env:
143+
RUST_TOOLCHAIN_VERSION: ${{ env.RUST_NIGHTLY_TOOLCHAIN_VERSION }}
144+
run: cargo "+$RUST_TOOLCHAIN_VERSION" fmt --all -- --check
142145

143146
run_clippy:
144147
name: Run Clippy

.vscode/settings.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"rust-analyzer.rustfmt.overrideCommand": [
3+
"rustfmt",
4+
"+nightly-2025-01-15",
5+
"--edition",
6+
"2024",
7+
"--"
8+
],
9+
}

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
### Changed
8+
9+
- BREAKING: Replace stackable-operator `initialize_logging` with stackable-telemetry `Tracing` ([#291]).
10+
- operator-binary
11+
- The file log directory was set by `LISTENER_OPERATOR_LOG_DIRECTORY`, and is now set by
12+
`ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
13+
- The console log level was set by `LISTENER_OPERATOR_LOG`, and is now set by `CONSOLE_LOG`.
14+
- olm-deployer
15+
- The file log directory was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG_DIRECTORY`, and is now set by
16+
`ROLLING_LOGS_DIR` (or via `--rolling-logs <DIRECTORY>`).
17+
- The console log level was set by `STKBL_LISTENER_OLM_DEPLOYER_LOG`, and is now set by `CONSOLE_LOG`.
18+
- Replace stackable-operator `print_startup_string` with `tracing::info!` with fields.
19+
20+
[#291]: https://github.com/stackabletech/listener-operator/pull/291
21+
22+
## [25.3.0] - 2025-03-21
23+
724
### Added
825

926
- Aggregate emitted Kubernetes events on the CustomResources ([#267]).

0 commit comments

Comments
 (0)