refactor: Source cluster domain from ValidatedCluster

Author: maltesander

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

@@ -81,7 +81,7 @@ pub(crate) mod test_support {
     use std::str::FromStr as _;
 
     use stackable_operator::{
-        commons::product_image_selection::ResolvedProductImage,
+        commons::{networking::DomainName, product_image_selection::ResolvedProductImage},
         crd::authentication::r#static::v1alpha1::{
             AuthenticationProvider as StaticAuthProvider, UserCredentialsSecretRef,
         },
@@ -168,6 +168,7 @@ pub(crate) mod test_support {
         ValidatedCluster::new(
             name,
             namespace,
+            DomainName::from_str("cluster.local").expect("valid cluster domain"),
             uid,
             image,
             product_version,

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

@@ -32,7 +32,7 @@ use stackable_operator::{
         self,
         framework::{create_vector_shutdown_file_command, remove_vector_shutdown_file_command},
     },
-    utils::{COMMON_BASH_TRAP_FUNCTIONS, cluster_info::KubernetesClusterInfo},
+    utils::COMMON_BASH_TRAP_FUNCTIONS,
     v2::{
         builder::pod::container::{EnvVarSet, new_container_builder},
         product_logging::framework::{
@@ -164,10 +164,8 @@ pub(crate) const LISTENER_DEFAULT_PORT_HTTPS_ENV: &str = "LISTENER_DEFAULT_PORT_
 ///
 /// The [`Pod`](`stackable_operator::k8s_openapi::api::core::v1::Pod`)s are accessible through the
 /// corresponding [`stackable_operator::k8s_openapi::api::core::v1::Service`] (from `build_rolegroup_headless_service`).
-#[allow(clippy::too_many_arguments)]
-pub(crate) async fn build_node_rolegroup_statefulset(
+pub(crate) fn build_node_rolegroup_statefulset(
     cluster: &ValidatedCluster,
-    cluster_info: &KubernetesClusterInfo,
     role_group_name: &RoleGroupName,
     rg: &NifiRoleGroupConfig,
     effective_replicas: Option<i32>,
@@ -251,7 +249,7 @@ pub(crate) async fn build_node_rolegroup_statefulset(
         "$POD_NAME.{service_name}.{namespace}.svc.{cluster_domain}",
         service_name = resource_names.headless_service_name(),
         namespace = cluster.namespace,
-        cluster_domain = cluster_info.cluster_domain,
+        cluster_domain = cluster.cluster_domain,
     );
 
     let sensitive_key_secret = &cluster.cluster_config.sensitive_properties.key_secret;

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

@@ -6,6 +6,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     client::Client,
+    commons::networking::DomainName,
     v2::{
         controller_utils::{self, get_namespace},
         types::kubernetes::NamespaceName,
@@ -38,6 +39,9 @@ type Result<T, E = Error> = std::result::Result<T, E>;
 pub struct DereferencedObjects {
     /// The namespace of the [`v1alpha1::NifiCluster`], parsed once here and reused everywhere.
     pub namespace: NamespaceName,
+    /// The Kubernetes cluster domain, captured from the client here so the build step needs no
+    /// client to assemble in-cluster DNS names.
+    pub cluster_domain: DomainName,
     pub authentication_classes: DereferencedAuthenticationClasses,
     pub authorization: DereferencedAuthorization,
 }
@@ -63,6 +67,7 @@ pub async fn dereference(
 
     Ok(DereferencedObjects {
         namespace,
+        cluster_domain: client.kubernetes_cluster_info.cluster_domain.clone(),
         authentication_classes,
         authorization,
     })

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

@@ -7,6 +7,7 @@ use std::{collections::BTreeMap, str::FromStr as _};
 use stackable_operator::{
     commons::{
         affinity::StackableAffinity,
+        networking::DomainName,
         product_image_selection::ResolvedProductImage,
         resources::{NoRuntimeLimits, Resources},
     },
@@ -140,6 +141,9 @@ pub struct ValidatedCluster {
     pub name: ClusterName,
     /// The namespace of the NifiCluster, parsed once in the dereference step and reused everywhere.
     pub namespace: NamespaceName,
+    /// The Kubernetes cluster domain, captured from the client in the dereference step so the
+    /// build step needs no client to assemble in-cluster DNS names.
+    pub cluster_domain: DomainName,
     /// The UID of the NifiCluster, used to build OwnerReferences downstream.
     pub uid: Uid,
     /// The product image.
@@ -198,6 +202,7 @@ impl ValidatedCluster {
     pub fn new(
         name: ClusterName,
         namespace: NamespaceName,
+        cluster_domain: DomainName,
         uid: Uid,
         image: ResolvedProductImage,
         product_version: ProductVersion,
@@ -216,6 +221,7 @@ impl ValidatedCluster {
             metadata,
             name,
             namespace,
+            cluster_domain,
             uid,
             image,
             product_version,

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

@@ -156,6 +156,7 @@ pub fn validate(
         .context(NoNodesDefinedSnafu)?;
 
     let namespace = dereferenced_objects.namespace.clone();
+    let cluster_domain = dereferenced_objects.cluster_domain.clone();
     let uid = get_uid(nifi).context(GetUidSnafu)?;
 
     // `app_version_label_value` is constructed to be a valid label value, so it is always a valid
@@ -166,6 +167,7 @@ pub fn validate(
     Ok(ValidatedCluster::new(
         name,
         namespace,
+        cluster_domain,
         uid,
         image,
         product_version,

rust/operator-binary/src/nifi_controller.rs

@@ -259,13 +259,11 @@ pub async fn reconcile_nifi(
 
             let rg_statefulset = build_node_rolegroup_statefulset(
                 &validated_cluster,
-                &client.kubernetes_cluster_info,
                 role_group_name,
                 rg,
                 effective_replicas,
                 &rbac_sa.name_any(),
             )
-            .await
             .with_context(|_| BuildStatefulSetSnafu {
                 rolegroup: role_group_name.clone(),
             })?;