diff --git a/crates/stackable-operator/CHANGELOG.md b/crates/stackable-operator/CHANGELOG.md index e81e0d9ab..b9e33e004 100644 --- a/crates/stackable-operator/CHANGELOG.md +++ b/crates/stackable-operator/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +### Fixed + +- Remove `Merge` trait bound from `erase` and make `product_specific_common_config` public ([#946]). + +[#946]: https://github.com/stackabletech/operator-rs/pull/946 + ## [0.84.0] - 2025-01-16 ### Added diff --git a/crates/stackable-operator/src/role_utils.rs b/crates/stackable-operator/src/role_utils.rs index e77672793..068705cd4 100644 --- a/crates/stackable-operator/src/role_utils.rs +++ b/crates/stackable-operator/src/role_utils.rs @@ -163,9 +163,11 @@ pub struct CommonConfiguration { // No docs needed, as we flatten this struct. // // This field is product-specific and can contain e.g. jvmArgumentOverrides. - // It is not accessible by operators, please use [`Role::get_product_specific_common_configs`] to read the values. + // + // If [`JavaCommonConfig`] is used, please use [`Role::get_merged_jvm_argument_overrides`] instead of + // reading this field directly. #[serde(flatten, default)] - pub(crate) product_specific_common_config: ProductSpecificCommonConfig, + pub product_specific_common_config: ProductSpecificCommonConfig, } impl CommonConfiguration { @@ -324,7 +326,7 @@ impl Role where T: Configuration + 'static, U: Default + JsonSchema + Serialize, - ProductSpecificCommonConfig: Default + JsonSchema + Serialize + Clone + Merge, + ProductSpecificCommonConfig: Default + JsonSchema + Serialize + Clone, { /// This casts a generic struct implementing [`crate::product_config_utils::Configuration`] /// and used in [`Role`] into a Box of a dynamically dispatched