refactor: drop dead chroot discovery code path

Author: maltesander

rust/operator-binary/src/controller.rs

@@ -607,22 +607,15 @@ pub async fn reconcile_hive(
             },
         )?;
 
-        for discovery_cm in discovery::build_discovery_configmaps(
-            &validated_cluster,
-            HiveRole::MetaStore,
-            None,
-            listener,
-        )
-        .await
-        .context(BuildDiscoveryConfigSnafu)?
-        {
-            let discovery_cm = cluster_resources
-                .add(client, discovery_cm)
-                .await
-                .context(ApplyDiscoveryConfigSnafu)?;
-            if let Some(generation) = discovery_cm.metadata.resource_version {
-                discovery_hash.write(generation.as_bytes())
-            }
+        let discovery_cm =
+            discovery::build_discovery_configmap(&validated_cluster, HiveRole::MetaStore, listener)
+                .context(BuildDiscoveryConfigSnafu)?;
+        let discovery_cm = cluster_resources
+            .add(client, discovery_cm)
+            .await
+            .context(ApplyDiscoveryConfigSnafu)?;
+        if let Some(generation) = discovery_cm.metadata.resource_version {
+            discovery_hash.write(generation.as_bytes());
         }
     }
 

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

@@ -34,29 +34,13 @@ fn cluster_object_ref(cluster: &ValidatedCluster) -> ObjectRef<v1alpha1::HiveClu
     ObjectRef::new(cluster.name.as_ref()).within(cluster.namespace.as_ref())
 }
 
-/// Builds discovery [`ConfigMap`]s for connecting to a [`v1alpha1::HiveCluster`] for all expected
-/// scenarios.
-pub async fn build_discovery_configmaps(
-    cluster: &ValidatedCluster,
-    hive_role: HiveRole,
-    chroot: Option<&str>,
-    listener: Listener,
-) -> Result<Vec<ConfigMap>, Error> {
-    let discovery_configmaps = vec![build_discovery_configmap(
-        cluster, hive_role, chroot, listener,
-    )?];
-
-    Ok(discovery_configmaps)
-}
-
 /// Build a discovery [`ConfigMap`] containing information about how to connect to a certain
 /// [`v1alpha1::HiveCluster`].
 ///
-/// Data is coming from the [`Listener`] objects. Connection string is only build by [`build_listener_connection_string`].
-fn build_discovery_configmap(
+/// Data is coming from the [`Listener`] objects. Connection string is only built by [`build_listener_connection_string`].
+pub fn build_discovery_configmap(
     cluster: &ValidatedCluster,
     hive_role: HiveRole,
-    chroot: Option<&str>,
     listener: Listener,
 ) -> Result<ConfigMap, Error> {
     let mut discovery_configmap = ConfigMapBuilder::new();
@@ -72,7 +56,7 @@ fn build_discovery_configmap(
 
     discovery_configmap.add_data(
         "HIVE".to_string(),
-        build_listener_connection_string(listener, &hive_role.to_string(), chroot)
+        build_listener_connection_string(listener, &hive_role.to_string())
             .context(ListenerConfigurationSnafu)?,
     );
 

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

@@ -15,22 +15,19 @@ pub enum Error {
     RoleListenerHasNoAddress { role: String },
     #[snafu(display("could not find port [{port_name}] for rolegroup listener {role}"))]
     NoServicePort { port_name: String, role: String },
-    #[snafu(display("chroot path {chroot} was relative (must be absolute)"))]
-    RelativeChroot { chroot: String },
 }
 
 // Builds the connection string with respect to the listener provided objects
 pub fn build_listener_connection_string(
     listener_ref: Listener,
-    role: &String,
-    chroot: Option<&str>,
+    role: &str,
 ) -> Result<String, Error> {
     // We only need the first address corresponding to the role
     let listener_address = listener_ref
         .status
         .and_then(|s| s.ingress_addresses?.into_iter().next())
         .context(RoleListenerHasNoAddressSnafu { role })?;
-    let mut conn_str = format!(
+    let conn_str = format!(
         "thrift://{address}:{port}",
         address = listener_address.address,
         port = listener_address
@@ -42,12 +39,6 @@ pub fn build_listener_connection_string(
                 role
             })?
     );
-    if let Some(chroot) = chroot {
-        if !chroot.starts_with('/') {
-            return RelativeChrootSnafu { chroot }.fail();
-        }
-        conn_str.push_str(chroot);
-    }
     Ok(conn_str)
 }
 

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

@@ -6,7 +6,6 @@ use stackable_operator::{
     commons::opa::{OpaApiVersion, OpaConfig},
     crd::s3,
     k8s_openapi::api::core::v1::ConfigMap,
-    kube::ResourceExt,
     v2::{controller_utils::get_namespace, types::kubernetes::SecretClassName},
 };
 
@@ -64,11 +63,9 @@ impl ResolvedOpaConfig {
             .await
             .context(InvalidOpaConfigSnafu)?;
 
+        let namespace = get_namespace(hive).context(ResolveNamespaceSnafu)?;
         let tls_secret_class = client
-            .get::<ConfigMap>(
-                &opa_config.config_map_name,
-                hive.namespace().as_deref().unwrap_or("default"),
-            )
+            .get::<ConfigMap>(&opa_config.config_map_name, namespace.as_ref())
             .await
             .ok()
             .and_then(|cm| cm.data)

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

@@ -195,8 +195,7 @@ pub fn validate_cluster(
         groups.insert(role_group_name, validated_rg);
     }
 
-    let mut role_group_configs = BTreeMap::new();
-    role_group_configs.insert(hive_role, groups);
+    let role_group_configs = BTreeMap::from([(hive_role, groups)]);
 
     let metadata_database_connection_details = hive
         .spec