move kubelet query to cluster_info mod

Author: razvan

crates/stackable-operator/src/client.rs

@@ -21,10 +21,7 @@ use tracing::trace;
 
 use crate::{
     kvp::LabelSelectorExt,
-    utils::{
-        cluster_info::{KubernetesClusterInfo, KubernetesClusterInfoOpts},
-        kubelet,
-    },
+    utils::cluster_info::{KubernetesClusterInfo, KubernetesClusterInfoOpts},
 };
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -88,8 +85,10 @@ pub enum Error {
     #[snafu(display("unable to create kubernetes client"))]
     CreateKubeClient { source: kube::Error },
 
-    #[snafu(display("unable to fetch kubelet config"))]
-    KubeletConfig { source: kubelet::Error },
+    #[snafu(display("unable to fetch cluster information from kubelet"))]
+    NewKubeletClusterInfo {
+        source: crate::utils::cluster_info::Error,
+    },
 }
 
 /// This `Client` can be used to access Kubernetes.
@@ -657,25 +656,9 @@ pub async fn initialize_operator(
         .context(InferKubeConfigSnafu)?;
     let default_namespace = kubeconfig.default_namespace.clone();
     let client = kube::Client::try_from(kubeconfig).context(CreateKubeClientSnafu)?;
-
-    let local_cluster_info_opts = match cluster_info_opts.kubernetes_cluster_domain {
-        None => {
-            trace!("Cluster domain not set, fetching kubelet config to determine cluster domain.");
-
-            let kubelet_config = kubelet::KubeletConfig::fetch(&client)
-                .await
-                .context(KubeletConfigSnafu)?;
-
-            KubernetesClusterInfoOpts {
-                kubernetes_cluster_domain: Some(kubelet_config.cluster_domain),
-            }
-        }
-        _ => KubernetesClusterInfoOpts {
-            kubernetes_cluster_domain: cluster_info_opts.kubernetes_cluster_domain.clone(),
-        },
-    };
-
-    let cluster_info = KubernetesClusterInfo::new(&local_cluster_info_opts);
+    let cluster_info = KubernetesClusterInfo::new(&client, cluster_info_opts)
+        .await
+        .context(NewKubeletClusterInfoSnafu)?;
 
     Ok(Client::new(
         client,

crates/stackable-operator/src/utils/cluster_info.rs

@@ -1,10 +1,14 @@
-use std::str::FromStr;
+use kube::Client;
+use snafu::{ResultExt, Snafu};
 
-use crate::commons::networking::DomainName;
+use crate::{commons::networking::DomainName, utils::kubelet};
 
-const KUBERNETES_CLUSTER_DOMAIN_DEFAULT: &str = "cluster.local";
+#[derive(Debug, Snafu)]
+pub enum Error {
+    #[snafu(display("unable to fetch kubelet config"))]
+    KubeletConfig { source: kubelet::Error },
+}
 
-/// Some information that we know about the Kubernetes cluster.
 #[derive(Debug, Clone)]
 pub struct KubernetesClusterInfo {
     /// The Kubernetes cluster domain, typically `cluster.local`.
@@ -21,25 +25,28 @@ pub struct KubernetesClusterInfoOpts {
 }
 
 impl KubernetesClusterInfo {
-    pub fn new(cluster_info_opts: &KubernetesClusterInfoOpts) -> Self {
+    pub async fn new(
+        client: &Client,
+        cluster_info_opts: &KubernetesClusterInfoOpts,
+    ) -> Result<Self, Error> {
         let cluster_domain = match &cluster_info_opts.kubernetes_cluster_domain {
             Some(cluster_domain) => {
                 tracing::info!(%cluster_domain, "Using configured Kubernetes cluster domain");
 
                 cluster_domain.clone()
             }
             None => {
-                // TODO(sbernauer): Do some sort of advanced auto-detection, see https://github.com/stackabletech/issues/issues/436.
-                // There have been attempts of parsing the `/etc/resolv.conf`, but they have been
-                // reverted. Please read on the linked issue for details.
-                let cluster_domain = DomainName::from_str(KUBERNETES_CLUSTER_DOMAIN_DEFAULT)
-                    .expect("KUBERNETES_CLUSTER_DOMAIN_DEFAULT constant must a valid domain");
-                tracing::info!(%cluster_domain, "Defaulting Kubernetes cluster domain as it has not been configured");
+                let kubelet_config = kubelet::KubeletConfig::fetch(client)
+                    .await
+                    .context(KubeletConfigSnafu)?;
+
+                let cluster_domain = kubelet_config.cluster_domain;
+                tracing::info!(%cluster_domain, "Using Kubernetes cluster domain from the kubelet config");
 
                 cluster_domain
             }
         };
 
-        Self { cluster_domain }
+        Ok(Self { cluster_domain })
     }
 }