Skip to content

Commit 84adc0e

Browse files
committed
chore: Merge branch 'main' into chore/bump-rust-deps-pre-25.11.0
2 parents 4bbb818 + 03051af commit 84adc0e

File tree

7 files changed

+89
-76
lines changed

7 files changed

+89
-76
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ All notable changes to this project will be documented in this file.
66

77
### Added
88

9+
- Add end-of-support checker which can be controlled with environment variables and CLI arguments ([#615]).
10+
- `EOS_CHECK_MODE` (`--eos-check-mode`) to set the EoS check mode. Currently, only "offline" is supported.
11+
- `EOS_INTERVAL` (`--eos-interval`) to set the interval in which the operator checks if it is EoS.
12+
- `EOS_DISABLED` (`--eos-disabled`) to disable the EoS checker completely.
913
- Add experimental support for Spark 4 ([#589])
1014
- Helm: Allow Pod `priorityClassName` to be configured ([#608]).
1115
- Support for Spark 3.5.7 ([#610]).
@@ -31,7 +35,6 @@ All notable changes to this project will be documented in this file.
3135

3236
- Support for Spark versions 3.5.5 has been dropped ([#610]).
3337

34-
3538
### Changed
3639

3740
- Bump stackable-operator to `0.100.1` and product-config to `0.8.0` ([#622]).
@@ -41,6 +44,7 @@ All notable changes to this project will be documented in this file.
4144
[#608]: https://github.com/stackabletech/spark-k8s-operator/pull/608
4245
[#610]: https://github.com/stackabletech/spark-k8s-operator/pull/610
4346
[#611]: https://github.com/stackabletech/spark-k8s-operator/pull/611
47+
[#615]: https://github.com/stackabletech/spark-k8s-operator/pull/615
4448
[#617]: https://github.com/stackabletech/spark-k8s-operator/pull/617
4549
[#619]: https://github.com/stackabletech/spark-k8s-operator/pull/619
4650
[#622]: https://github.com/stackabletech/spark-k8s-operator/pull/622

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
@@ -18,6 +18,8 @@ built = { version = "0.8", features = ["chrono", "git2"] }
1818
clap = "4.5"
1919
const_format = "0.2"
2020
futures = { version = "0.3", features = ["compat"] }
21+
# We pin the kube version, as we use a patch for 2.0.1 below
22+
kube = "=2.0.1"
2123
rstest = "0.26"
2224
semver = "1.0"
2325
serde = { version = "1.0", features = ["derive"] }
@@ -33,3 +35,6 @@ indoc = "2"
3335
# [patch."https://github.com/stackabletech/operator-rs.git"]
3436
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
3537
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
38+
39+
[patch.crates-io]
40+
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)