refactor: switch to v2 ownerref, remove results

Author: maltesander

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

@@ -9,7 +9,9 @@ use stackable_operator::{
     kvp::Labels,
     product_logging::framework::VECTOR_CONFIG_FILE,
     utils::cluster_info::KubernetesClusterInfo,
-    v2::config_file_writer::to_java_properties_string,
+    v2::{
+        builder::meta::ownerreference_from_resource, config_file_writer::to_java_properties_string,
+    },
 };
 
 use crate::{
@@ -48,11 +50,6 @@ pub enum Error {
         rolegroup: String,
     },
 
-    #[snafu(display("metadata build failure"))]
-    Metadata {
-        source: stackable_operator::builder::meta::Error,
-    },
-
     #[snafu(display("failed to build jvm.config"))]
     BuildJvmConfig { source: crate::config::jvm::Error },
 }
@@ -194,8 +191,7 @@ pub fn build_rolegroup_config_map(
             ObjectMetaBuilder::new()
                 .name(&config_map_name)
                 .namespace(cluster.namespace.to_string())
-                .ownerreference_from_resource(cluster, None, Some(true))
-                .context(MetadataSnafu)?
+                .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
                 .with_labels(recommended_labels.clone())
                 .build(),
         )
@@ -225,8 +221,7 @@ pub fn build_rolegroup_catalog_config_map(
             ObjectMetaBuilder::new()
                 .name(&catalog_config_map_name)
                 .namespace(cluster.namespace.to_string())
-                .ownerreference_from_resource(cluster, None, Some(true))
-                .context(MetadataSnafu)?
+                .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
                 .with_labels(recommended_labels.clone())
                 .build(),
         )

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

@@ -8,6 +8,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::PersistentVolumeClaim,
     kube::ResourceExt,
     kvp::Labels,
+    v2::builder::meta::ownerreference_from_resource,
 };
 
 use crate::{
@@ -20,11 +21,6 @@ pub const LISTENER_VOLUME_DIR: &str = "/stackable/listener";
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-    #[snafu(display("listener object is missing metadata to build owner reference"))]
-    ObjectMissingMetadataForOwnerRef {
-        source: stackable_operator::builder::meta::Error,
-    },
-
     #[snafu(display("failed to build listener volume"))]
     BuildListenerPersistentVolume {
         source: stackable_operator::builder::pod::volume::ListenerOperatorVolumeSourceBuilderError,
@@ -41,8 +37,7 @@ pub fn build_group_listener(
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(cluster)
             .name(listener_group_name)
-            .ownerreference_from_resource(cluster, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
+            .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .with_labels(recommended_labels)
             .build(),
         spec: ListenerSpec {

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

@@ -1,25 +1,17 @@
 use std::collections::BTreeMap;
 
-use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     builder::meta::ObjectMetaBuilder,
     k8s_openapi::api::core::v1::{Service, ServicePort, ServiceSpec},
     kvp::{Annotations, Labels},
+    v2::builder::meta::ownerreference_from_resource,
 };
 
 use crate::{
     controller::ValidatedCluster,
     crd::{METRICS_PORT, METRICS_PORT_NAME, TrinoRole},
 };
 
-#[derive(Snafu, Debug)]
-pub enum Error {
-    #[snafu(display("object is missing metadata to build owner reference"))]
-    ObjectMissingMetadataForOwnerRef {
-        source: stackable_operator::builder::meta::Error,
-    },
-}
-
 /// The rolegroup headless [`Service`] is a service that allows direct access to the instances of a certain rolegroup
 /// This is mostly useful for internal communication between peers, or for clients that perform client-side load balancing.
 pub fn build_rolegroup_headless_service(
@@ -29,8 +21,8 @@ pub fn build_rolegroup_headless_service(
     recommended_labels: &Labels,
     selector: BTreeMap<String, String>,
     ports: Vec<ServicePort>,
-) -> Result<Service, Error> {
-    Ok(Service {
+) -> Service {
+    Service {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(cluster)
             .name(
@@ -39,8 +31,7 @@ pub fn build_rolegroup_headless_service(
                     .headless_service_name()
                     .to_string(),
             )
-            .ownerreference_from_resource(cluster, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
+            .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .with_labels(recommended_labels.clone())
             .build(),
         spec: Some(ServiceSpec {
@@ -53,7 +44,7 @@ pub fn build_rolegroup_headless_service(
             ..ServiceSpec::default()
         }),
         status: None,
-    })
+    }
 }
 
 /// The rolegroup metrics [`Service`] is a service that exposes metrics and a prometheus scraping label.
@@ -63,8 +54,8 @@ pub fn build_rolegroup_metrics_service(
     role_group_name: &str,
     recommended_labels: &Labels,
     selector: BTreeMap<String, String>,
-) -> Result<Service, Error> {
-    Ok(Service {
+) -> Service {
+    Service {
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(cluster)
             .name(
@@ -73,8 +64,7 @@ pub fn build_rolegroup_metrics_service(
                     .metrics_service_name()
                     .to_string(),
             )
-            .ownerreference_from_resource(cluster, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
+            .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .with_labels(recommended_labels.clone())
             .with_labels(prometheus_labels())
             .with_annotations(prometheus_annotations())
@@ -89,7 +79,7 @@ pub fn build_rolegroup_metrics_service(
             ..ServiceSpec::default()
         }),
         status: None,
-    })
+    }
 }
 
 pub(crate) fn headless_service_ports(cluster: &ValidatedCluster) -> Vec<ServicePort> {

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

@@ -34,7 +34,7 @@ use stackable_operator::{
     product_logging,
     shared::time::Duration,
     v2::{
-        builder::pod::container::EnvVarSet,
+        builder::{meta::ownerreference_from_resource, pod::container::EnvVarSet},
         product_logging::framework::{ValidatedContainerLogConfigChoice, vector_container},
         types::kubernetes::{ContainerName, VolumeName},
     },
@@ -78,11 +78,6 @@ pub enum Error {
     #[snafu(display("missing secret lifetime"))]
     MissingSecretLifetime,
 
-    #[snafu(display("object is missing metadata to build owner reference"))]
-    ObjectMissingMetadataForOwnerRef {
-        source: stackable_operator::builder::meta::Error,
-    },
-
     #[snafu(display("internal operator failure: {source}"))]
     InternalOperatorFailure { source: crate::crd::Error },
 
@@ -467,8 +462,7 @@ pub fn build_rolegroup_statefulset(
         metadata: ObjectMetaBuilder::new()
             .name_and_namespace(trino)
             .name(resource_names.stateful_set_name().to_string())
-            .ownerreference_from_resource(trino, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
+            .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
             .with_labels(cluster.recommended_labels(trino_role, role_group_name))
             .with_label(RESTART_CONTROLLER_ENABLED_LABEL.to_owned())
             .with_annotations(annotations)

rust/operator-binary/src/trino_controller.rs

@@ -155,11 +155,6 @@ pub enum Error {
         source: build::resource::listener::Error,
     },
 
-    #[snafu(display("failed to configure service"))]
-    ServiceConfiguration {
-        source: build::resource::service::Error,
-    },
-
     #[snafu(display("failed to create internal secret"))]
     CreateInternalSecret {
         source: random_secret_creation::Error,
@@ -274,17 +269,15 @@ pub async fn reconcile_trino(
                 &role_group_service_recommended_labels,
                 role_group_service_selector.clone().into(),
                 headless_service_ports(&validated_cluster),
-            )
-            .context(ServiceConfigurationSnafu)?;
+            );
 
             let rg_metrics_service = build_rolegroup_metrics_service(
                 &validated_cluster,
                 trino_role,
                 role_group_name,
                 &role_group_service_recommended_labels,
                 role_group_service_selector.into(),
-            )
-            .context(ServiceConfigurationSnafu)?;
+            );
 
             let rg_configmap = build::resource::config_map::build_rolegroup_config_map(
                 &validated_cluster,