refactor: remove more rolegroupref references.

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -27,7 +27,7 @@ use stackable_operator::{
     },
     kvp::Labels,
     logging::controller::ReconcilerError,
-    role_utils::{GenericRoleConfig, RoleGroupRef},
+    role_utils::GenericRoleConfig,
     shared::time::Duration,
     status::condition::{
         compute_conditions, operations::ClusterOperationsConditionBuilder,
@@ -437,22 +437,22 @@ pub enum Error {
         source: stackable_operator::cluster_resources::Error,
     },
 
-    #[snafu(display("failed to apply Service for {}", rolegroup))]
+    #[snafu(display("failed to apply Service for role group {role_group}"))]
     ApplyRoleGroupService {
         source: stackable_operator::cluster_resources::Error,
-        rolegroup: RoleGroupRef<v1alpha1::KafkaCluster>,
+        role_group: RoleGroupName,
     },
 
-    #[snafu(display("failed to apply ConfigMap for {}", rolegroup))]
+    #[snafu(display("failed to apply ConfigMap for role group {role_group}"))]
     ApplyRoleGroupConfig {
         source: stackable_operator::cluster_resources::Error,
-        rolegroup: RoleGroupRef<v1alpha1::KafkaCluster>,
+        role_group: RoleGroupName,
     },
 
-    #[snafu(display("failed to apply StatefulSet for {}", rolegroup))]
+    #[snafu(display("failed to apply StatefulSet for role group {role_group}"))]
     ApplyRoleGroupStatefulSet {
         source: stackable_operator::cluster_resources::Error,
-        rolegroup: RoleGroupRef<v1alpha1::KafkaCluster>,
+        role_group: RoleGroupName,
     },
 
     #[snafu(display("failed to build discovery ConfigMap"))]
@@ -605,10 +605,6 @@ pub async fn reconcile_kafka(
 
     for (kafka_role, rg_map) in &validated_cluster.role_group_configs {
         for (rolegroup_name, validated_rg) in rg_map {
-            // `rolegroup_ref` is a v1 `RoleGroupRef` retained only for the error context of the
-            // per-rolegroup apply calls below. All other identification uses the typed
-            // `kafka_role` / `rolegroup_name` (and `ValidatedCluster::resource_names`).
-            let rolegroup_ref = kafka.rolegroup_ref(kafka_role, rolegroup_name.to_string());
             // The Vector agent config is the static `vector.yaml`, added to the rolegroup
             // ConfigMap only when the Vector agent is enabled (resolved during validation).
             let vector_config = validated_rg
@@ -682,19 +678,19 @@ pub async fn reconcile_kafka(
                 .add(client, rg_headless_service)
                 .await
                 .with_context(|_| ApplyRoleGroupServiceSnafu {
-                    rolegroup: rolegroup_ref.clone(),
+                    role_group: rolegroup_name.clone(),
                 })?;
             cluster_resources
                 .add(client, rg_metrics_service)
                 .await
                 .with_context(|_| ApplyRoleGroupServiceSnafu {
-                    rolegroup: rolegroup_ref.clone(),
+                    role_group: rolegroup_name.clone(),
                 })?;
             cluster_resources
                 .add(client, rg_configmap)
                 .await
                 .with_context(|_| ApplyRoleGroupConfigSnafu {
-                    rolegroup: rolegroup_ref.clone(),
+                    role_group: rolegroup_name.clone(),
                 })?;
 
             // Note: The StatefulSet needs to be applied after all ConfigMaps and Secrets it mounts
@@ -705,7 +701,7 @@ pub async fn reconcile_kafka(
                     .add(client, rg_statefulset)
                     .await
                     .with_context(|_| ApplyRoleGroupStatefulSetSnafu {
-                        rolegroup: rolegroup_ref.clone(),
+                        role_group: rolegroup_name.clone(),
                     })?,
             );
         }

rust/operator-binary/src/controller/build/properties/product_logging/mod.rs

@@ -41,8 +41,8 @@ const CONSOLE_CONVERSION_PATTERN_LOG4J2: &str = "%d{ISO8601} %p [%t] %c - %m%n";
 
 /// Get the role group ConfigMap data with the log4j/log4j2 logging configuration.
 ///
-/// The Vector agent config is built separately via [`build_vector_config`] (which needs a
-/// [`RoleGroupRef`]) and added by the caller.
+/// The Vector agent config (`vector.yaml`) is provided separately via
+/// [`vector_config_file_content`] and added by the caller.
 pub fn role_group_config_map_data(
     product_version: &str,
     merged_config: &AnyConfig,

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

@@ -58,9 +58,9 @@ pub enum Error {
 
 /// The rolegroup [`ConfigMap`] configures the rolegroup based on the configuration given by the administrator.
 ///
-/// `vector_config` is the Vector agent config built by the caller (where a `RoleGroupRef` is
-/// available); it is `None` when the Vector agent is disabled. Resource naming and labels use the
-/// role (derived from `validated_rg.config`) and the typed `role_group_name`.
+/// `vector_config` is the static Vector agent config (`vector.yaml`) added by the caller; it is
+/// `None` when the Vector agent is disabled. Resource naming and labels use the role (derived
+/// from `validated_rg.config`) and the typed `role_group_name`.
 pub fn build_rolegroup_config_map(
     validated_cluster: &ValidatedCluster,
     role_group_name: &RoleGroupName,

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

@@ -17,7 +17,7 @@ use stackable_operator::{
     config::merge::Merge,
     deep_merger::ObjectOverrides,
     kube::{CustomResource, runtime::reflector::ObjectRef},
-    role_utils::{GenericRoleConfig, Role, RoleGroupRef},
+    role_utils::{GenericRoleConfig, Role},
     schemars::{self, JsonSchema},
     status::condition::{ClusterCondition, HasStatusCondition},
     v2::{
@@ -321,19 +321,6 @@ impl v1alpha1::KafkaCluster {
             })
     }
 
-    /// Metadata about a rolegroup
-    pub fn rolegroup_ref(
-        &self,
-        role: &KafkaRole,
-        group_name: impl Into<String>,
-    ) -> RoleGroupRef<Self> {
-        RoleGroupRef {
-            cluster: ObjectRef::from_obj(self),
-            role: role.to_string(),
-            role_group: group_name.into(),
-        }
-    }
-
     pub fn role_config(&self, role: &KafkaRole) -> Option<&GenericRoleConfig> {
         match role {
             KafkaRole::Broker => self.spec.brokers.as_ref().map(|b| &b.role_config),
@@ -346,12 +333,6 @@ impl v1alpha1::KafkaCluster {
             role: KafkaRole::Broker.to_string(),
         })
     }
-
-    pub fn controller_role(&self) -> Result<&ControllerRole, Error> {
-        self.spec.controllers.as_ref().context(MissingRoleSnafu {
-            role: KafkaRole::Controller.to_string(),
-        })
-    }
 }
 
 /// Reference to a single `Pod` that is a component of a [`KafkaCluster`]