Skip to content

Commit 04481e7

Browse files
committed
chore: Merge branch 'main' into chore/bump-rust-deps-pre-25.11.0
2 parents 8f7d5b7 + 5a17b05 commit 04481e7

7 files changed

Lines changed: 353 additions & 94 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ All notable changes to this project will be documented in this file.
99
- Helm: Allow Pod `priorityClassName` to be configured ([#840]).
1010
- Add support for `2.6.0` ([#849]).
1111
- Add `prometheus.io/path|port|scheme` annotations to metrics service ([#855]).
12+
- Add end-of-support checker ([#860]).
13+
- `EOS_CHECK_MODE` (`--eos-check-mode`) to set the EoS check mode. Currently, only "offline" is supported.
14+
- `EOS_INTERVAL` (`--eos-interval`) to set the interval in which the operator checks if it is EoS.
15+
- `EOS_DISABLED` (`--eos-disabled`) to disable the EoS checker completely.
1216

1317
### Changed
1418

@@ -28,6 +32,7 @@ All notable changes to this project will be documented in this file.
2832
[#849]: https://github.com/stackabletech/nifi-operator/pull/849
2933
[#855]: https://github.com/stackabletech/nifi-operator/pull/855
3034
[#859]: https://github.com/stackabletech/nifi-operator/pull/859
35+
[#860]: https://github.com/stackabletech/nifi-operator/pull/860
3136

3237
## [25.7.0] - 2025-07-23
3338

Cargo.lock

Lines changed: 5 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.nix

Lines changed: 30 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ const_format = "0.2"
2020
fnv = "1.0"
2121
futures = { version = "0.3", features = ["compat"] }
2222
indoc = "2.0"
23+
# We pin the kube version, as we use a patch for 2.0.1 below
24+
kube = "=2.0.1"
2325
pin-project = "1.1"
2426
rand = "0.9"
2527
rstest = "0.26"
@@ -37,3 +39,6 @@ xml-rs = "1.0"
3739
# [patch."https://github.com/stackabletech/operator-rs.git"]
3840
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
3941
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
42+
43+
[patch.crates-io]
44+
kube = { git = "https://github.com/stackabletech/kube-rs", branch = "2.0.1-fix-schema-hoisting" }

crate-hashes.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)