Skip to content

Commit 574e5b0

Browse files
sbernauersbernauer
authored
Merge branch 'main' into feat/config-overrides-json
2 parents e54f425 + bf378d9 commit 574e5b0

4 files changed

Lines changed: 32 additions & 27 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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ All notable changes to this project will be documented in this file.
1414

1515
- BREAKING: Change signature of `ContainerBuilder::add_env_vars` from `Vec<EnvVar>` to `IntoIterator<Item = EnvVar>` ([#1163]).
1616
- BREAKING: Remove `EXPERIMENTAL_` prefix in `CONFIG_OVERRIDE_FILE_HEADER_KEY` and `CONFIG_OVERRIDE_FILE_FOOTER_KEY` ([#1191]).
17-
- BREAKING: Add `ConfigOverrides` type parameter to `CommonConfiguration`, `Role`,
18-
and `RoleGroup`. The `config_overrides` field is now generic instead of
19-
`HashMap<String, HashMap<String, String>>` ([#1177]).
17+
- BREAKING: Bump `kube` from a custom version (`fe69cc486ff8e62a7da61d64ec3ebbd9e64c43b5`, which is between `3.0.1` and `3.1.0` and was needed to pull in schema fixes) to `3.1.0`. This means that the CRD schema generation bugs [#1934](https://github.com/kube-rs/kube/pull/1934) and [#1942](https://github.com/kube-rs/kube/pull/1942) are fixed ([#1192]).
18+
- BREAKING: Add `ConfigOverrides` type parameter to `CommonConfiguration`, `Role` and `RoleGroup`.
19+
The `config_overrides` field is now generic instead of `HashMap<String, HashMap<String, String>>` ([#1177]).
2020

2121
[#1163]: https://github.com/stackabletech/operator-rs/pull/1163
2222
[#1177]: https://github.com/stackabletech/operator-rs/pull/1177
2323
[#1191]: https://github.com/stackabletech/operator-rs/pull/1191
24+
[#1192]: https://github.com/stackabletech/operator-rs/pull/1192
2425

2526
## [0.109.0] - 2026-04-07
2627

‎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
@@ -1128,7 +1128,7 @@ spec:
11281128
type: string
11291129
type: object
11301130
custom:
1131-
description: Custom log configuration provided in a ConfigMap
1131+
description: Log configuration provided in a ConfigMap
11321132
properties:
11331133
configMap:
11341134
description: ConfigMap containing the log configuration files
@@ -1208,7 +1208,7 @@ spec:
12081208
type: string
12091209
type: object
12101210
custom:
1211-
description: Custom log configuration provided in a ConfigMap
1211+
description: Log configuration provided in a ConfigMap
12121212
properties:
12131213
configMap:
12141214
description: ConfigMap containing the log configuration files
@@ -1288,7 +1288,7 @@ spec:
12881288
type: string
12891289
type: object
12901290
custom:
1291-
description: Custom log configuration provided in a ConfigMap
1291+
description: Log configuration provided in a ConfigMap
12921292
properties:
12931293
configMap:
12941294
description: ConfigMap containing the log configuration files
@@ -1368,7 +1368,7 @@ spec:
13681368
type: string
13691369
type: object
13701370
custom:
1371-
description: Custom log configuration provided in a ConfigMap
1371+
description: Log configuration provided in a ConfigMap
13721372
properties:
13731373
configMap:
13741374
description: ConfigMap containing the log configuration files
@@ -1448,7 +1448,7 @@ spec:
14481448
type: string
14491449
type: object
14501450
custom:
1451-
description: Custom log configuration provided in a ConfigMap
1451+
description: Log configuration provided in a ConfigMap
14521452
properties:
14531453
configMap:
14541454
description: ConfigMap containing the log configuration files

0 commit comments

Comments
 (0)