Skip to content

Commit 891e888

Browse files
committed
bump to op-rs 0.80.0
1 parent ed1d96c commit 891e888

File tree

9 files changed

+164
-81
lines changed

9 files changed

+164
-81
lines changed

Cargo.lock

Lines changed: 77 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] }
2121
serde_json = "1.0"
2222
serde_yaml = "0.9"
2323
snafu = "0.8"
24-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.79.0" }
24+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.80.0" }
2525
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
2626
strum = { version = "0.26", features = ["derive"] }
2727
tokio = { version = "1.40", features = ["full"] }

rust/crd/src/lib.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ use stackable_operator::{
4141
schemars::{self, JsonSchema},
4242
status::condition::{ClusterCondition, HasStatusCondition},
4343
time::Duration,
44-
utils::cluster_domain::KUBERNETES_CLUSTER_DOMAIN,
44+
utils::cluster_info::KubernetesClusterInfo,
4545
};
4646
use strum::{Display, EnumIter, EnumString, IntoStaticStr};
4747

@@ -983,17 +983,15 @@ pub struct HdfsPodRef {
983983
}
984984

985985
impl HdfsPodRef {
986-
pub fn fqdn(&self) -> Cow<str> {
986+
pub fn fqdn(&self, cluster_info: &KubernetesClusterInfo) -> Cow<str> {
987987
self.fqdn_override.as_deref().map_or_else(
988988
|| {
989-
let cluster_domain = KUBERNETES_CLUSTER_DOMAIN.get().expect(
990-
"KUBERNETES_CLUSTER_DOMAIN must first be set by calling initialize_operator",
991-
);
992989
Cow::Owned(format!(
993990
"{pod_name}.{role_group_service_name}.{namespace}.svc.{cluster_domain}",
994991
pod_name = self.pod_name,
995992
role_group_service_name = self.role_group_service_name,
996993
namespace = self.namespace,
994+
cluster_domain = cluster_info.cluster_domain,
997995
))
998996
},
999997
Cow::Borrowed,

0 commit comments

Comments
 (0)