refactor: fold the discovery ConfigMap into the build aggregator

Author: maltesander

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

@@ -12,6 +12,7 @@ use crate::controller::{
     KubernetesResources, ValidatedCluster,
     build::resource::{
         config_map::{self, build_rolegroup_config_map},
+        discovery::{self, build_discovery_config_map},
         pdb::build_pdb,
         service::{build_rolegroup_metrics_service, build_rolegroup_service},
         statefulset::{self, build_rolegroup_statefulset},
@@ -35,6 +36,9 @@ pub enum Error {
         source: statefulset::Error,
         role_group: RoleGroupName,
     },
+
+    #[snafu(display("failed to build discovery ConfigMap"))]
+    Discovery { source: discovery::Error },
 }
 
 /// Builds every Kubernetes resource for the given validated cluster.
@@ -44,9 +48,6 @@ pub enum Error {
 /// failures only. `cluster_info` is static cluster metadata (not a client call), and
 /// `service_account_name` is the name of the RBAC `ServiceAccount` the role-group Pods run under
 /// (RBAC resources are built and applied separately, in the reconcile step).
-///
-/// The role-level discovery `ConfigMap` is applied separately in the reconcile step and is not
-/// part of this bundle.
 pub fn build(
     cluster: &ValidatedCluster,
     cluster_info: &KubernetesClusterInfo,
@@ -96,6 +97,10 @@ pub fn build(
         }
     }
 
+    // The role-level discovery ConfigMap advertises the cluster's connection information; it is
+    // deterministic (derived only from the validated cluster and static cluster info).
+    config_maps.push(build_discovery_config_map(cluster, cluster_info).context(DiscoverySnafu)?);
+
     Ok(KubernetesResources {
         stateful_sets,
         services,

rust/operator-binary/src/hbase_controller.rs

@@ -29,10 +29,7 @@ use stackable_operator::{
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
-    controller::{
-        build::{self, resource::discovery::build_discovery_config_map},
-        controller_name, operator_name, product_name,
-    },
+    controller::{build, controller_name, operator_name, product_name},
     crd::{APP_NAME, HbaseClusterStatus, OPERATOR_NAME, v1alpha1},
 };
 
@@ -75,16 +72,6 @@ pub enum Error {
         source: stackable_operator::cluster_resources::Error,
     },
 
-    #[snafu(display("failed to build discovery configmap"))]
-    BuildDiscoveryConfigMap {
-        source: crate::controller::build::resource::discovery::Error,
-    },
-
-    #[snafu(display("failed to apply discovery configmap"))]
-    ApplyDiscoveryConfigMap {
-        source: stackable_operator::cluster_resources::Error,
-    },
-
     #[snafu(display("failed to update status"))]
     ApplyStatus {
         source: stackable_operator::client::Error,
@@ -210,16 +197,6 @@ pub async fn reconcile_hbase(
         );
     }
 
-    // Discovery CM will fail to build until the rest of the cluster has been deployed, so do it last
-    // so that failure won't inhibit the rest of the cluster from booting up.
-    let discovery_cm =
-        build_discovery_config_map(&validated_cluster, &client.kubernetes_cluster_info)
-            .context(BuildDiscoveryConfigMapSnafu)?;
-    cluster_resources
-        .add(client, discovery_cm)
-        .await
-        .context(ApplyDiscoveryConfigMapSnafu)?;
-
     let cluster_operation_cond_builder =
         ClusterOperationsConditionBuilder::new(&hbase.spec.cluster_operation);