feat: trim optional trailing dot of cluster domain to always get the …

…non-FQDN variant
stackabletech · Feb 14, 2025 · fb36ae9 · fb36ae9
1 parent 85f141a
commit fb36ae9
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/rust/operator-binary/src/backend/mod.rs b/rust/operator-binary/src/backend/mod.rs
@@ -179,7 +179,8 @@ impl SecretVolumeSelector {
         scope: &scope::SecretScope,
     ) -> Result<Vec<Address>, ScopeAddressesError> {
         use scope_addresses_error::*;
-        let cluster_domain = &pod_info.kubernetes_cluster_domain;
+        // Turn FQDNs into bare domain names by removing the trailing dot
+        let cluster_domain = pod_info.kubernetes_cluster_domain.trim_end_matches(".");
         let namespace = &self.namespace;
         Ok(match scope {
             scope::SecretScope::Node => {
@@ -208,7 +209,13 @@ impl SecretVolumeSelector {
                 .listener_addresses
                 .get(name)
                 .context(NoListenerAddressesSnafu { listener: name })?
-                .to_vec(),
+                .iter()
+                .map(|addr| match addr {
+                    // Turn FQDNs into bare domain names by removing the trailing dot
+                    Address::Dns(dns) => Address::Dns(dns.trim_end_matches(".").to_string()),
+                    _ => addr.clone(),
+                })
+                .collect(),
         })
     }