refactor: make cluster resources for znode infailible

Author: maltesander

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

@@ -63,18 +63,6 @@ pub(crate) fn build_server_rolegroup_headless_service(
     }
 }
 
-/// The metrics [`Service`] name, `<cluster>-<role>-<rolegroup>-metrics`.
-///
-/// [`ResourceNames`](stackable_operator::v2::role_group_utils::ResourceNames) has no metrics
-/// service helper, so the `-metrics` suffix is appended to the qualified role-group name (which is
-/// also the StatefulSet name).
-fn metrics_service_name(cluster: &ValidatedCluster, role_group_name: &RoleGroupName) -> String {
-    format!(
-        "{qualified}-metrics",
-        qualified = cluster.resource_names(role_group_name).stateful_set_name()
-    )
-}
-
 /// The rolegroup [`Service`] for exposing metrics
 pub(crate) fn build_server_rolegroup_metrics_service(
     cluster: &ValidatedCluster,
@@ -84,7 +72,11 @@ pub(crate) fn build_server_rolegroup_metrics_service(
     let metrics_port = cluster.metrics_http_port(rolegroup_config);
     let metadata = ObjectMetaBuilder::new()
         .name_and_namespace(cluster)
-        .name(metrics_service_name(cluster, role_group_name))
+        .name(
+            cluster
+                .resource_names(role_group_name)
+                .metrics_service_name(),
+        )
         .ownerreference(ownerreference_from_resource(cluster, None, Some(true)))
         .with_labels(cluster.recommended_labels(role_group_name))
         .with_labels(prometheus_labels())

rust/operator-binary/src/znode_controller.rs

@@ -111,12 +111,6 @@ pub enum Error {
 
     #[snafu(display("object has no namespace"))]
     ObjectHasNoNamespace,
-
-    #[snafu(display("Znode {znode:?} missing expected keys (name and/or namespace)"))]
-    ZnodeMissingExpectedKeys {
-        source: stackable_operator::cluster_resources::Error,
-        znode: ObjectRef<v1alpha1::ZookeeperZnode>,
-    },
 }
 type Result<T, E = Error> = std::result::Result<T, E>;
 
@@ -162,7 +156,6 @@ impl ReconcilerError for Error {
             Error::Finalizer { .. } => None,
             Error::DeleteOrphans { .. } => None,
             Error::ObjectHasNoNamespace => None,
-            Error::ZnodeMissingExpectedKeys { .. } => None,
         }
     }
 }
@@ -267,6 +260,9 @@ async fn reconcile_apply(
     zk: v1alpha1::ZookeeperCluster,
     znode_path: &str,
 ) -> Result<controller::Action> {
+    // Infallible: `ValidatedZnode`'s object reference always contains name, namespace and uid
+    // (set unconditionally during the validate step), which is all `ClusterResources::new`
+    // requires.
     let mut cluster_resources = ClusterResources::new(
         APP_NAME,
         OPERATOR_NAME,
@@ -275,10 +271,10 @@ async fn reconcile_apply(
         ClusterResourceApplyStrategy::from(&validated_znode.cluster_operation),
         &validated_znode.object_overrides,
     )
-    .with_context(|_| ZnodeMissingExpectedKeysSnafu {
-        znode: ObjectRef::<v1alpha1::ZookeeperZnode>::new(&validated_znode.name)
-            .within(validated_znode.namespace.as_ref()),
-    })?;
+    .expect(
+        "ClusterResources should be created because the ValidatedZnode's object reference \
+         always contains name, namespace and uid",
+    );
 
     znode_mgmt::ensure_znode_exists(
         &zk_mgmt_addr(