Skip to content

Commit fd13803

Browse files
authored
Merge branch 'main' into fix/no-uppercase-in-kubernetes-resource-names
2 parents 91108ce + 9b8ea36 commit fd13803

File tree

20 files changed

+926
-486
lines changed

20 files changed

+926
-486
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ hyper = { version = "1.4.1", features = ["full"] }
3434
hyper-util = "0.1.8"
3535
itertools = "0.14.0"
3636
json-patch = "4.0.0"
37-
k8s-openapi = { version = "0.25.0", default-features = false, features = ["schemars", "v1_33"] }
37+
k8s-openapi = { version = "0.26.0", default-features = false, features = ["schemars", "v1_34"] }
3838
# We use rustls instead of openssl for easier portability, e.g. so that we can build stackablectl without the need to vendor (build from source) openssl
3939
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
40-
kube = { version = "1.1.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
40+
kube = { version = "2.0.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "rustls-tls", "ring"] }
4141
opentelemetry = "0.30.0"
4242
opentelemetry_sdk = { version = "0.30.0", features = ["rt-tokio"] }
4343
opentelemetry-appender-tracing = "0.30.1"
@@ -55,7 +55,7 @@ regex = "1.10.6"
5555
rsa = { version = "0.9.6", features = ["sha2"] }
5656
rstest = "0.26.1"
5757
rstest_reuse = "0.7.0"
58-
schemars = { version = "0.8.21", features = ["url"] }
58+
schemars = { version = "1.0.0", features = ["url2"] }
5959
semver = "1.0.23"
6060
serde = { version = "1.0.210", features = ["derive"] }
6161
serde_json = "1.0.128"

crates/stackable-operator/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,15 @@ All notable changes to this project will be documented in this file.
88

99
- Extend `ObjectMetaBuilder` with `finalizers` ([#1094]).
1010

11+
### Changed
12+
13+
- BREAKING: Upgrade to `schemars` 1.0, `kube` 2.0 and `k8s-openapi` 0.26 (using Kubernetes 1.34) ([#1091]).
14+
1115
### Fixed
1216

1317
- BREAKING: Don't allow uppercase characters in Kubernetes object names ([#1095]).
1418

19+
[#1091]: https://github.com/stackabletech/operator-rs/pull/1091
1520
[#1094]: https://github.com/stackabletech/operator-rs/pull/1094
1621
[#1095]: https://github.com/stackabletech/operator-rs/pull/1095
1722

crates/stackable-operator/crds/AuthenticationClass.yaml

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

crates/stackable-operator/crds/DummyCluster.yaml

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

crates/stackable-operator/crds/Listener.yaml

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

crates/stackable-operator/crds/ListenerClass.yaml

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

crates/stackable-operator/crds/PodListeners.yaml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/stackable-operator/crds/S3Bucket.yaml

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

0 commit comments

Comments
 (0)