fix: remove obsolete errors, dead enum variant, tighten visibility of constants

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -35,7 +35,7 @@ mod validate;
 
 use crate::{
     crd::{
-        self, APP_NAME, KafkaClusterStatus, KafkaPodDescriptor, MetadataManager, OPERATOR_NAME,
+        APP_NAME, KafkaClusterStatus, KafkaPodDescriptor, MetadataManager, OPERATOR_NAME,
         authorization::KafkaAuthorizationConfig,
         listener::get_kafka_listener_config,
         role::{AnyConfig, AnyConfigOverrides, KafkaRole},
@@ -73,8 +73,8 @@ pub enum Error {
         source: crate::crd::listener::KafkaListenerError,
     },
 
-    #[snafu(display("failed to apply role Service"))]
-    ApplyRoleService {
+    #[snafu(display("failed to apply bootstrap Listener"))]
+    ApplyBootstrapListener {
         source: stackable_operator::cluster_resources::Error,
     },
 
@@ -150,9 +150,6 @@ pub enum Error {
         source: error_boundary::InvalidObject,
     },
 
-    #[snafu(display("KafkaCluster object is misconfigured"))]
-    MisconfiguredKafkaCluster { source: crd::Error },
-
     #[snafu(display("failed to build statefulset"))]
     BuildStatefulset {
         source: crate::resource::statefulset::Error,
@@ -184,7 +181,7 @@ impl ReconcilerError for Error {
         match self {
             Error::Dereference { .. } => None,
             Error::ValidateCluster { .. } => None,
-            Error::ApplyRoleService { .. } => None,
+            Error::ApplyBootstrapListener { .. } => None,
             Error::ApplyRoleGroupService { .. } => None,
             Error::ApplyRoleGroupConfig { .. } => None,
             Error::ApplyRoleGroupStatefulSet { .. } => None,
@@ -199,7 +196,6 @@ impl ReconcilerError for Error {
             Error::FailedToCreatePdb { .. } => None,
             Error::GetRequiredLabels { .. } => None,
             Error::InvalidKafkaCluster { .. } => None,
-            Error::MisconfiguredKafkaCluster { .. } => None,
             Error::BuildStatefulset { .. } => None,
             Error::BuildConfigMap { .. } => None,
             Error::BuildService { .. } => None,
@@ -444,7 +440,7 @@ pub async fn reconcile_kafka(
                     cluster_resources
                         .add(client, rg_bootstrap_listener)
                         .await
-                        .context(ApplyRoleServiceSnafu)?,
+                        .context(ApplyBootstrapListenerSnafu)?,
                 );
             }
 

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

@@ -22,9 +22,6 @@ use crate::{
 
 #[derive(Snafu, Debug)]
 pub enum Error {
-    #[snafu(display("invalid metadata manager"))]
-    InvalidMetadataManager { source: crate::crd::Error },
-
     #[snafu(display("failed to build ConfigMap for {}", rolegroup))]
     BuildRoleGroupConfig {
         source: stackable_operator::builder::configmap::Error,
@@ -56,12 +53,6 @@ pub enum Error {
         rolegroup: RoleGroupRef<v1alpha1::KafkaCluster>,
     },
 
-    #[snafu(display("failed to build jaas configuration file for {rolegroup}"))]
-    BuildJaasConfig { rolegroup: String },
-
-    #[snafu(display("failed to build pod descriptors"))]
-    BuildPodDescriptors { source: crate::crd::Error },
-
     #[snafu(display("no Kraft controllers found to build"))]
     NoKraftControllersFound,
 }

rust/operator-binary/src/crd/role/broker.rs

@@ -33,7 +33,6 @@ pub const BROKER_PROPERTIES_FILE: &str = "broker.properties";
 pub enum BrokerContainer {
     Vector,
     KcatProber,
-    GetService,
     Kafka,
 }
 

rust/operator-binary/src/product_logging.rs

@@ -18,11 +18,11 @@ pub const BROKER_ID_POD_MAP_DIR: &str = "/stackable/broker-id-pod-map";
 pub const STACKABLE_LOG_CONFIG_DIR: &str = "/stackable/log_config";
 pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
 // log4j
-pub const LOG4J_CONFIG_FILE: &str = "log4j.properties";
-pub const KAFKA_LOG4J_FILE: &str = "kafka.log4j.xml";
+const LOG4J_CONFIG_FILE: &str = "log4j.properties";
+const KAFKA_LOG4J_FILE: &str = "kafka.log4j.xml";
 // log4j2
-pub const LOG4J2_CONFIG_FILE: &str = "log4j2.properties";
-pub const KAFKA_LOG4J2_FILE: &str = "kafka.log4j2.xml";
+const LOG4J2_CONFIG_FILE: &str = "log4j2.properties";
+const KAFKA_LOG4J2_FILE: &str = "kafka.log4j2.xml";
 // max size
 pub const MAX_KAFKA_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {
     value: 10.0,

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

@@ -118,11 +118,6 @@ pub enum Error {
         source: stackable_operator::builder::pod::container::Error,
     },
 
-    #[snafu(display("invalid kafka listeners"))]
-    InvalidKafkaListeners {
-        source: crate::crd::listener::KafkaListenerError,
-    },
-
     #[snafu(display("failed to build Labels"))]
     LabelBuild {
         source: stackable_operator::kvp::LabelError,
@@ -147,19 +142,14 @@ pub enum Error {
     #[snafu(display("failed to retrieve rolegroup replicas"))]
     RoleGroupReplicas { source: crd::role::Error },
 
-    #[snafu(display(
-        "cluster does not define 'metadata.name' which is required for the Kafka cluster id"
-    ))]
-    ClusterIdMissing,
-
     #[snafu(display("vector agent is enabled but vector aggregator ConfigMap is missing"))]
     VectorAggregatorConfigMapMissing,
 }
 
 /// The broker rolegroup [`StatefulSet`] runs the rolegroup, as configured by the administrator.
 ///
 /// The [`Pod`](`stackable_operator::k8s_openapi::api::core::v1::Pod`)s are accessible through the corresponding
-/// [`Service`](`stackable_operator::k8s_openapi::api::core::v1::Service`) from [`build_rolegroup_service`](`crate::resource::service::build_rolegroup_headless_service`).
+/// [`Service`](`stackable_operator::k8s_openapi::api::core::v1::Service`) from [`build_rolegroup_headless_service`](`crate::resource::service::build_rolegroup_headless_service`).
 pub fn build_broker_rolegroup_statefulset(
     kafka: &v1alpha1::KafkaCluster,
     kafka_role: &KafkaRole,