fix: consolidate merging

Author: maltesander

rust/operator-binary/src/controller/build/resource/statefulset.rs

@@ -124,9 +124,6 @@ pub enum Error {
         source: stackable_operator::builder::pod::container::Error,
     },
 
-    #[snafu(display("failed to merge pod overrides"))]
-    MergePodOverrides { source: crd::role::Error },
-
     #[snafu(display("missing secret lifetime"))]
     MissingSecretLifetime,
 
@@ -472,16 +469,8 @@ pub fn build_broker_rolegroup_statefulset(
     // Don't run kcat pod as PID 1, to ensure that default signal handlers apply
     pod_template_spec.share_process_namespace = Some(true);
 
-    pod_template.merge_from(
-        kafka_role
-            .role_pod_overrides(kafka)
-            .context(MergePodOverridesSnafu)?,
-    );
-    pod_template.merge_from(
-        kafka_role
-            .role_group_pod_overrides(kafka, role_group_name.as_ref())
-            .context(MergePodOverridesSnafu)?,
-    );
+    // Pod overrides were already merged (role <- role group) during validation.
+    pod_template.merge_from(validated_rg.pod_overrides.clone());
 
     Ok(StatefulSet {
         metadata: ObjectMetaBuilder::new()
@@ -778,16 +767,8 @@ pub fn build_controller_rolegroup_statefulset(
 
     let mut pod_template = pod_builder.build_template();
 
-    pod_template.merge_from(
-        kafka_role
-            .role_pod_overrides(kafka)
-            .context(MergePodOverridesSnafu)?,
-    );
-    pod_template.merge_from(
-        kafka_role
-            .role_group_pod_overrides(kafka, role_group_name.as_ref())
-            .context(MergePodOverridesSnafu)?,
-    );
+    // Pod overrides were already merged (role <- role group) during validation.
+    pod_template.merge_from(validated_rg.pod_overrides.clone());
 
     Ok(StatefulSet {
         metadata: ObjectMetaBuilder::new()

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

@@ -8,7 +8,6 @@ use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
 use stackable_operator::{
     commons::resources::{NoRuntimeLimits, Resources},
-    k8s_openapi::api::core::v1::PodTemplateSpec,
     product_logging::spec::ContainerLogConfig,
     schemars::{self, JsonSchema},
     v2::config_overrides::KeyValueConfigOverrides,
@@ -118,71 +117,6 @@ impl KafkaRole {
         "kafka"
     }
 
-    pub fn role_pod_overrides(
-        &self,
-        kafka: &v1alpha1::KafkaCluster,
-    ) -> Result<PodTemplateSpec, Error> {
-        let pod_overrides = match self {
-            Self::Broker => kafka
-                .broker_role()
-                .with_context(|_| MissingRoleSnafu {
-                    role: self.to_string(),
-                })?
-                .config
-                .pod_overrides
-                .clone(),
-            Self::Controller => kafka
-                .controller_role()
-                .with_context(|_| MissingRoleSnafu {
-                    role: self.to_string(),
-                })?
-                .config
-                .pod_overrides
-                .clone(),
-        };
-
-        Ok(pod_overrides)
-    }
-
-    pub fn role_group_pod_overrides(
-        &self,
-        kafka: &v1alpha1::KafkaCluster,
-        rolegroup: &str,
-    ) -> Result<PodTemplateSpec, Error> {
-        let pod_overrides = match self {
-            Self::Broker => kafka
-                .broker_role()
-                .with_context(|_| MissingRoleSnafu {
-                    role: self.to_string(),
-                })?
-                .role_groups
-                .get(rolegroup)
-                .with_context(|| MissingRoleGroupSnafu {
-                    role: self.to_string(),
-                    rolegroup: rolegroup.to_string(),
-                })?
-                .config
-                .pod_overrides
-                .clone(),
-            Self::Controller => kafka
-                .controller_role()
-                .with_context(|_| MissingRoleSnafu {
-                    role: self.to_string(),
-                })?
-                .role_groups
-                .get(rolegroup)
-                .with_context(|| MissingRoleGroupSnafu {
-                    role: self.to_string(),
-                    rolegroup: rolegroup.to_string(),
-                })?
-                .config
-                .pod_overrides
-                .clone(),
-        };
-
-        Ok(pod_overrides)
-    }
-
     pub fn replicas(
         &self,
         kafka: &v1alpha1::KafkaCluster,