Skip to content

Commit 85e35bc

Browse files
sbernauersbernauer
committed
Merge remote-tracking branch 'origin/main' into fix/make-client-authentication-method-opt-in
2 parents 855dde2 + bf378d9 commit 85e35bc

4 files changed

Lines changed: 32 additions & 24 deletions

File tree

‎Cargo.lock‎

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

‎Cargo.toml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ json-patch = "4.0.0"
4242
k8s-openapi = { version = "0.27.0", default-features = false, features = ["schemars", "v1_35"] }
4343
# 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
4444
# We use ring instead of aws-lc-rs, as this currently fails to build in "make run-dev"
45-
# We need a few schema fixes in kube, that went into main, but are not released yet
46-
kube = { git = "https://github.com/kube-rs/kube-rs", rev = "fe69cc486ff8e62a7da61d64ec3ebbd9e64c43b5", version = "=3.0.1", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] }
45+
kube = { version = "3.1.0", default-features = false, features = ["client", "jsonpatch", "runtime", "derive", "admission", "rustls-tls", "ring"] }
4746
opentelemetry = "0.31.0"
4847
opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"] }
4948
opentelemetry-appender-tracing = "0.31.0"

‎crates/stackable-operator/CHANGELOG.md‎

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

1313
- BREAKING: Change signature of `ContainerBuilder::add_env_vars` from `Vec<EnvVar>` to `IntoIterator<Item = EnvVar>` ([#1163]).
1414
- BREAKING: Remove `EXPERIMENTAL_` prefix in `CONFIG_OVERRIDE_FILE_HEADER_KEY` and `CONFIG_OVERRIDE_FILE_FOOTER_KEY` ([#1191]).
15+
- BREAKING: Bump `kube` from a custom version (`fe69cc486ff8e62a7da61d64ec3ebbd9e64c43b5`, which is between `3.0.1` and `3.1.0`
16+
and was needed to pull in schema fixes) to `3.1.0`. This means that the CRD schema generation bugs
17+
[#1934](https://github.com/kube-rs/kube/pull/1934) and [#1942](https://github.com/kube-rs/kube/pull/1942) are fixed ([#1192]).
1518
- BREAKING: In [#1178] the `clientAuthenticationMethod` was added to the `ClientAuthenticationOptions` struct,
1619
resulting it to show up in all product CRDs. even those that don't support configuring the client authentication method.
1720
With this change, operators need to opt-in to the `clientAuthenticationMethod` field by using the new
@@ -21,6 +24,7 @@ All notable changes to this project will be documented in this file.
2124

2225
[#1163]: https://github.com/stackabletech/operator-rs/pull/1163
2326
[#1191]: https://github.com/stackabletech/operator-rs/pull/1191
27+
[#1192]: https://github.com/stackabletech/operator-rs/pull/1192
2428
[#1194]: https://github.com/stackabletech/operator-rs/pull/1194
2529

2630
## [0.109.0] - 2026-04-07

‎crates/stackable-operator/crds/DummyCluster.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ spec:
476476
type: string
477477
type: object
478478
custom:
479-
description: Custom log configuration provided in a ConfigMap
479+
description: Log configuration provided in a ConfigMap
480480
properties:
481481
configMap:
482482
description: ConfigMap containing the log configuration files
@@ -556,7 +556,7 @@ spec:
556556
type: string
557557
type: object
558558
custom:
559-
description: Custom log configuration provided in a ConfigMap
559+
description: Log configuration provided in a ConfigMap
560560
properties:
561561
configMap:
562562
description: ConfigMap containing the log configuration files
@@ -636,7 +636,7 @@ spec:
636636
type: string
637637
type: object
638638
custom:
639-
description: Custom log configuration provided in a ConfigMap
639+
description: Log configuration provided in a ConfigMap
640640
properties:
641641
configMap:
642642
description: ConfigMap containing the log configuration files
@@ -716,7 +716,7 @@ spec:
716716
type: string
717717
type: object
718718
custom:
719-
description: Custom log configuration provided in a ConfigMap
719+
description: Log configuration provided in a ConfigMap
720720
properties:
721721
configMap:
722722
description: ConfigMap containing the log configuration files
@@ -796,7 +796,7 @@ spec:
796796
type: string
797797
type: object
798798
custom:
799-
description: Custom log configuration provided in a ConfigMap
799+
description: Log configuration provided in a ConfigMap
800800
properties:
801801
configMap:
802802
description: ConfigMap containing the log configuration files
@@ -1088,7 +1088,7 @@ spec:
10881088
type: string
10891089
type: object
10901090
custom:
1091-
description: Custom log configuration provided in a ConfigMap
1091+
description: Log configuration provided in a ConfigMap
10921092
properties:
10931093
configMap:
10941094
description: ConfigMap containing the log configuration files
@@ -1168,7 +1168,7 @@ spec:
11681168
type: string
11691169
type: object
11701170
custom:
1171-
description: Custom log configuration provided in a ConfigMap
1171+
description: Log configuration provided in a ConfigMap
11721172
properties:
11731173
configMap:
11741174
description: ConfigMap containing the log configuration files
@@ -1248,7 +1248,7 @@ spec:
12481248
type: string
12491249
type: object
12501250
custom:
1251-
description: Custom log configuration provided in a ConfigMap
1251+
description: Log configuration provided in a ConfigMap
12521252
properties:
12531253
configMap:
12541254
description: ConfigMap containing the log configuration files
@@ -1328,7 +1328,7 @@ spec:
13281328
type: string
13291329
type: object
13301330
custom:
1331-
description: Custom log configuration provided in a ConfigMap
1331+
description: Log configuration provided in a ConfigMap
13321332
properties:
13331333
configMap:
13341334
description: ConfigMap containing the log configuration files
@@ -1408,7 +1408,7 @@ spec:
14081408
type: string
14091409
type: object
14101410
custom:
1411-
description: Custom log configuration provided in a ConfigMap
1411+
description: Log configuration provided in a ConfigMap
14121412
properties:
14131413
configMap:
14141414
description: ConfigMap containing the log configuration files

0 commit comments

Comments
 (0)