bump to op-rs 0.80.0

stackabletech · Oct 23, 2024 · 891e888 · 891e888
1 parent ed1d96c
commit 891e888
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.79.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }

diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -41,7 +41,7 @@ use stackable_operator::{
     schemars::{self, JsonSchema},
     status::condition::{ClusterCondition, HasStatusCondition},
     time::Duration,
-    utils::cluster_domain::KUBERNETES_CLUSTER_DOMAIN,
+    utils::cluster_info::KubernetesClusterInfo,
 };
 use strum::{Display, EnumIter, EnumString, IntoStaticStr};
 
@@ -983,17 +983,15 @@ pub struct HdfsPodRef {
 }
 
 impl HdfsPodRef {
-    pub fn fqdn(&self) -> Cow<str> {
+    pub fn fqdn(&self, cluster_info: &KubernetesClusterInfo) -> Cow<str> {
         self.fqdn_override.as_deref().map_or_else(
             || {
-                let cluster_domain = KUBERNETES_CLUSTER_DOMAIN.get().expect(
-                    "KUBERNETES_CLUSTER_DOMAIN must first be set by calling initialize_operator",
-                );
                 Cow::Owned(format!(
                     "{pod_name}.{role_group_service_name}.{namespace}.svc.{cluster_domain}",
                     pod_name = self.pod_name,
                     role_group_service_name = self.role_group_service_name,
                     namespace = self.namespace,
+                    cluster_domain = cluster_info.cluster_domain,
                 ))
             },
             Cow::Borrowed,