refactor: drop redundant HiveCluster::merged_config

Author: maltesander

rust/operator-binary/src/crd/affinity.rs

@@ -30,11 +30,9 @@ mod tests {
             api::core::v1::{PodAffinityTerm, PodAntiAffinity, WeightedPodAffinityTerm},
             apimachinery::pkg::apis::meta::v1::LabelSelector,
         },
-        utils::yaml_from_str_singleton_map,
     };
 
     use super::*;
-    use crate::crd::v1alpha1;
 
     #[rstest]
     #[case(HiveRole::MetaStore)]
@@ -44,6 +42,8 @@ mod tests {
         kind: HiveCluster
         metadata:
           name: simple-hive
+          namespace: default
+          uid: 12345678-1234-1234-1234-123456789012
         spec:
           image:
             productVersion: 4.2.0
@@ -55,11 +55,15 @@ mod tests {
               default:
                 replicas: 1
         "#;
-        let hive: v1alpha1::HiveCluster =
-            yaml_from_str_singleton_map(input).expect("invalid test input");
-        let merged_config = hive
-            .merged_config(&role, &role.rolegroup_ref(&hive, "default"))
-            .unwrap();
+        let hive = crate::controller::test_support::minimal_hive(input);
+        let validated = crate::controller::test_support::validated_cluster(&hive);
+        let merged_config = validated
+            .role_group_configs
+            .get(&role)
+            .and_then(|groups| groups.get("default"))
+            .expect("role group should exist")
+            .config
+            .clone();
 
         assert_eq!(
             merged_config.affinity,

rust/operator-binary/src/crd/mod.rs

@@ -16,7 +16,7 @@ use stackable_operator::{
         },
     },
     config::{
-        fragment::{self, Fragment, ValidationError},
+        fragment::{Fragment, ValidationError},
         merge::Merge,
     },
     crd::s3,
@@ -306,35 +306,6 @@ impl v1alpha1::HiveCluster {
             .as_ref()
             .and_then(|a| a.opa.as_ref())
     }
-
-    /// Retrieve and merge resource configs for role and role groups
-    pub fn merged_config(
-        &self,
-        role: &HiveRole,
-        rolegroup_ref: &RoleGroupRef<Self>,
-    ) -> Result<MetaStoreConfig, Error> {
-        // Initialize the result with all default values as baseline
-        let conf_defaults = MetaStoreConfig::default_config(&self.name_any(), role);
-
-        // Retrieve role resource config
-        let role = self.role(role)?;
-        let mut conf_role = role.config.config.to_owned();
-
-        // Retrieve rolegroup specific resource config
-        let role_group = self.rolegroup(rolegroup_ref)?;
-        let mut conf_role_group = role_group.config.config;
-
-        // Merge more specific configs into default config
-        // Hierarchy is:
-        // 1. RoleGroup
-        // 2. Role
-        // 3. Default
-        conf_role.merge(&conf_defaults);
-        conf_role_group.merge(&conf_role);
-
-        tracing::debug!("Merged config: {:?}", conf_role_group);
-        fragment::validate(conf_role_group).context(FragmentValidationFailureSnafu)
-    }
 }
 
 #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]