fix: remove obsolete errors & cleanup

Author: maltesander

rust/operator-binary/src/zk_controller.rs

@@ -774,35 +774,29 @@ fn build_server_rolegroup_statefulset(
         })
         .service_account_name(service_account.name_any());
 
-    if let Some(ContainerLogConfig {
+    // Use the user-provided custom log ConfigMap if one is configured, otherwise fall back to the
+    // rolegroup's own ConfigMap.
+    let log_config_map = if let Some(ContainerLogConfig {
         choice:
             Some(ContainerLogConfigChoice::Custom(CustomContainerLogConfig {
                 custom: ConfigMapLogConfig { config_map },
             })),
     }) = logging.containers.get(&v1alpha1::Container::Zookeeper)
     {
-        pod_builder
-            .add_volume(Volume {
-                name: "log-config".to_string(),
-                config_map: Some(ConfigMapVolumeSource {
-                    name: config_map.into(),
-                    ..ConfigMapVolumeSource::default()
-                }),
-                ..Volume::default()
-            })
-            .context(AddVolumeSnafu)?;
+        config_map.into()
     } else {
-        pod_builder
-            .add_volume(Volume {
-                name: "log-config".to_string(),
-                config_map: Some(ConfigMapVolumeSource {
-                    name: rolegroup_ref.object_name(),
-                    ..ConfigMapVolumeSource::default()
-                }),
-                ..Volume::default()
-            })
-            .context(AddVolumeSnafu)?;
-    }
+        rolegroup_ref.object_name()
+    };
+    pod_builder
+        .add_volume(Volume {
+            name: "log-config".to_string(),
+            config_map: Some(ConfigMapVolumeSource {
+                name: log_config_map,
+                ..ConfigMapVolumeSource::default()
+            }),
+            ..Volume::default()
+        })
+        .context(AddVolumeSnafu)?;
 
     if logging.enable_vector_agent {
         match &zk.spec.cluster_config.vector_aggregator_config_map_name {

rust/operator-binary/src/zk_controller/build/discovery.rs

@@ -30,9 +30,6 @@ pub enum Error {
     #[snafu(display("object has no namespace associated"))]
     NoNamespace,
 
-    #[snafu(display("failed to list expected pods"))]
-    ExpectedPods { source: crate::crd::Error },
-
     #[snafu(display("{listener} does not have a port with the name {port_name:?}"))]
     PortNotFound {
         port_name: String,

rust/operator-binary/src/zk_controller/validate.rs

@@ -50,9 +50,6 @@ pub enum Error {
     #[snafu(display("failed to validate authentication classes"))]
     InvalidAuthenticationClassConfiguration { source: authentication::Error },
 
-    #[snafu(display("object defines no server role"))]
-    NoServerRole,
-
     #[snafu(display("failed to retrieve role {role:?}"))]
     MissingRole {
         source: crate::crd::Error,

rust/operator-binary/src/znode_controller.rs

@@ -62,11 +62,6 @@ pub enum Error {
     ))]
     ObjectMissingMetadata,
 
-    #[snafu(display("could not find server role service name for {zk:?}"))]
-    NoZkSvcName {
-        zk: ObjectRef<v1alpha1::ZookeeperCluster>,
-    },
-
     #[snafu(display("could not find server role service for {zk:?}"))]
     FindZkSvc {
         source: stackable_operator::client::Error,
@@ -159,7 +154,6 @@ impl ReconcilerError for Error {
             Error::Dereference { .. } => None,
             Error::ValidateCluster { .. } => None,
             Error::ObjectMissingMetadata => None,
-            Error::NoZkSvcName { zk } => Some(zk.clone().erase()),
             Error::FindZkSvc { zk, .. } => Some(zk.clone().erase()),
             Error::NoZkFqdn { zk } => Some(zk.clone().erase()),
             Error::EnsureZnode { zk, .. } => Some(zk.clone().erase()),