move object_meta to build step

Author: adwk67

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

@@ -5,7 +5,10 @@ use stackable_operator::{
     builder::meta::ObjectMetaBuilder,
     kvp::{LabelError, Labels},
     utils::cluster_info::KubernetesClusterInfo,
-    v2::types::{common::Port, operator::RoleGroupName},
+    v2::{
+        builder::meta::ownerreference_from_resource,
+        types::{common::Port, operator::RoleGroupName},
+    },
 };
 
 use crate::{
@@ -178,6 +181,22 @@ pub(crate) fn pod_refs(cluster: &ValidatedCluster, role: &HdfsNodeRole) -> Vec<H
         .collect()
 }
 
+/// Returns an [`ObjectMetaBuilder`] pre-filled with the namespace, the resource `name`, an owner
+/// reference back to the cluster, and the given recommended `labels`.
+pub(crate) fn object_meta(
+    cluster: &ValidatedCluster,
+    name: impl Into<String>,
+    labels: Labels,
+) -> ObjectMetaBuilder {
+    let mut builder = ObjectMetaBuilder::new();
+    builder
+        .name_and_namespace(cluster)
+        .name(name)
+        .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
+        .with_labels(labels);
+    builder
+}
+
 /// Builds the common [`ObjectMetaBuilder`] shared by a role group's owned resources
 /// (the ConfigMap and the StatefulSet): name, namespace, owner reference and the
 /// recommended labels, all derived from the validated cluster.
@@ -190,7 +209,8 @@ pub(crate) fn rolegroup_metadata(
     role: &HdfsNodeRole,
     role_group_name: &RoleGroupName,
 ) -> ObjectMetaBuilder {
-    cluster.object_meta(
+    object_meta(
+        cluster,
         cluster
             .role_group_resource_names(role, role_group_name)
             .qualified_role_group_name()

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

@@ -18,6 +18,7 @@ use crate::{
         ValidatedCluster,
         build::{
             kerberos::KerberosConfig,
+            object_meta,
             properties::{
                 ConfigFileName, core_site::CoreSiteConfigBuilder, hdfs_site::HdfsSiteConfigBuilder,
             },
@@ -67,7 +68,7 @@ pub fn build_discovery_config_map(
         &DISCOVERY_ROLE_GROUP,
     );
 
-    let metadata = cluster.object_meta(cluster.name.clone(), labels).build();
+    let metadata = object_meta(cluster, cluster.name.clone(), labels).build();
 
     ConfigMapBuilder::new()
         .metadata(metadata)

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

@@ -61,14 +61,14 @@ pub(crate) fn rolegroup_headless_service(
     };
 
     Ok(Service {
-        metadata: cluster
-            .object_meta(
-                cluster
-                    .governing_service_name(role, role_group_name)
-                    .to_string(),
-                cluster.recommended_labels(role, role_group_name),
-            )
-            .build(),
+        metadata: build::object_meta(
+            cluster,
+            cluster
+                .governing_service_name(role, role_group_name)
+                .to_string(),
+            cluster.recommended_labels(role, role_group_name),
+        )
+        .build(),
         spec: Some(service_spec),
         status: None,
     })
@@ -106,26 +106,26 @@ pub(crate) fn rolegroup_metrics_service(
     };
 
     Ok(Service {
-        metadata: cluster
-            .object_meta(
-                cluster
-                    .role_group_resource_names(role, role_group_name)
-                    .metrics_service_name()
-                    .to_string(),
-                cluster.recommended_labels(role, role_group_name),
-            )
-            .with_labels(prometheus_labels(&Scraping::Enabled))
-            .with_annotations(prometheus_annotations(
-                &Scraping::Enabled,
-                if cluster.has_https_enabled() {
-                    &Scheme::Https
-                } else {
-                    &Scheme::Http
-                },
-                "/prom",
-                &build::native_metrics_port(cluster, role),
-            ))
-            .build(),
+        metadata: build::object_meta(
+            cluster,
+            cluster
+                .role_group_resource_names(role, role_group_name)
+                .metrics_service_name()
+                .to_string(),
+            cluster.recommended_labels(role, role_group_name),
+        )
+        .with_labels(prometheus_labels(&Scraping::Enabled))
+        .with_annotations(prometheus_annotations(
+            &Scraping::Enabled,
+            if cluster.has_https_enabled() {
+                &Scheme::Https
+            } else {
+                &Scheme::Http
+            },
+            "/prom",
+            &build::native_metrics_port(cluster, role),
+        ))
+        .build(),
         spec: Some(service_spec),
         status: None,
     })

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

@@ -1,7 +1,6 @@
 use std::{collections::BTreeMap, str::FromStr};
 
 use stackable_operator::{
-    builder::meta::ObjectMetaBuilder,
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::{
         apps::v1::StatefulSet,
@@ -13,7 +12,6 @@ use stackable_operator::{
     kvp::Labels,
     v2::{
         HasName, HasUid, NameIsValidLabelValue,
-        builder::meta::ownerreference_from_resource,
         kvp::label::recommended_labels,
         role_group_utils::ResourceNames,
         role_utils::{self, RoleGroupConfig},
@@ -206,18 +204,6 @@ impl ValidatedCluster {
         self.recommended_labels_for(&role.into(), role_group_name)
     }
 
-    /// Returns an [`ObjectMetaBuilder`] pre-filled with the namespace, the resource `name`, an owner
-    /// reference back to this cluster, and the given recommended `labels`.
-    pub(crate) fn object_meta(&self, name: impl Into<String>, labels: Labels) -> ObjectMetaBuilder {
-        let mut builder = ObjectMetaBuilder::new();
-        builder
-            .name_and_namespace(self)
-            .name(name)
-            .ownerreference(ownerreference_from_resource(self, None, Some(true)))
-            .with_labels(labels);
-        builder
-    }
-
     /// The name of a role group's governing headless Service.
     ///
     /// Used as the headless Service's own name, as the StatefulSet's (immutable) `serviceName`,