Skip to content

Commit b8c7f80

Browse files
committed
chore: Merge branch 'main' into chore/bump-rust-deps-pre-25.11.0
2 parents 2594d1f + a366fe2 commit b8c7f80

File tree

7 files changed

+1066
-261
lines changed

7 files changed

+1066
-261
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
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 ([#752]).
1010
- Add support for `34.0.0` ([#755]).
1111
- Add `prometheus.io/path|port|scheme` annotations to metrics services ([#761]).
12+
- Add end-of-support checker ([#765]).
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

@@ -34,7 +38,7 @@ All notable changes to this project will be documented in this file.
3438
[#755]: https://github.com/stackabletech/druid-operator/pull/755
3539
[#756]: https://github.com/stackabletech/druid-operator/pull/756
3640
[#761]: https://github.com/stackabletech/druid-operator/pull/761
37-
[#766]: https://github.com/stackabletech/druid-operator/pull/766
41+
[#765]: https://github.com/stackabletech/druid-operator/pull/765
3842

3943
## [25.7.0] - 2025-07-23
4044

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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ repository = "https://github.com/stackabletech/druid-operator"
1111

1212
[workspace.dependencies]
1313
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["telemetry", "versioned"], tag = "stackable-operator-0.100.1" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = [
15+
"telemetry",
16+
"versioned",
17+
], tag = "stackable-operator-0.100.1" }
1518

1619
anyhow = "1.0"
1720
built = { version = "0.8", features = ["chrono", "git2"] }
@@ -20,6 +23,8 @@ const_format = "0.2"
2023
fnv = "1.0"
2124
futures = { version = "0.3", features = ["compat"] }
2225
indoc = "2.0"
26+
# We pin the kube version, as we use a patch for 2.0.1 below
27+
kube = "=2.0.1"
2328
openssl = "0.10"
2429
pin-project = "1.1"
2530
rstest = "0.26"
@@ -35,3 +40,6 @@ tracing = "0.1"
3540
[patch."https://github.com/stackabletech/operator-rs.git"]
3641
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
3742
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
43+
44+
[patch.crates-io]
45+
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)