Skip to content

Commit aad7eaf

Browse files
nightkrfhennigmaltesandersbernauersoenkeliebau
committed
Initial work on config merging (#368)
## Description This is a starting point for #362, but is intended to be usable outside of that context (in this case, the primary motivation for getting this done now is #365). Co-authored-by: Teo Klestrup Röijezon <teo.roijezon@stackable.de> Co-authored-by: Felix Hennig <mail@felixhennig.com> Co-authored-by: Malte Sander <contact@maltesander.com> Co-authored-by: Sebastian Bernauer <sebastian.bernauer@stackable.de> Co-authored-by: Sönke Liebau <soenke.liebau@stackable.de>
1 parent e44853e commit aad7eaf

File tree

7 files changed

+646
-0
lines changed

7 files changed

+646
-0
lines changed

CHANGELOG.md

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

99
### Added
1010

11+
- Typed `Merge` trait ([#368]).
1112
- New commons::s3 module with common S3 connection structs ([#377]).
1213
- New `TlsAuthenticationProvider` for `AuthenticationClass` ([#387]).
1314

15+
[#368]: https://github.com/stackabletech/operator-rs/pull/368
1416
[#377]: https://github.com/stackabletech/operator-rs/issues/377
1517
[#387]: https://github.com/stackabletech/operator-rs/pull/387
1618

Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ derivative = "2.2.0"
3434
tracing-opentelemetry = "0.17.2"
3535
opentelemetry = { version = "0.17.0", features = ["rt-tokio"] }
3636
opentelemetry-jaeger = { version = "0.16.0", features = ["rt-tokio"] }
37+
stackable-operator-derive = { path = "stackable-operator-derive" }
3738

3839
[dev-dependencies]
3940
rstest = "0.12.0"
@@ -44,3 +45,6 @@ serde_yaml = "0.8"
4445
default = ["native-tls"]
4546
native-tls = ["kube/native-tls"]
4647
rustls-tls = ["kube/rustls-tls"]
48+
49+
[workspace]
50+
members = ["stackable-operator-derive"]

0 commit comments

Comments
 (0)