Skip to content

Commit da290fa

Browse files
committed
replace expect with error handling
1 parent db8a7c9 commit da290fa

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{env, path::Path, str::FromStr, sync::OnceLock};
22

33
use snafu::{OptionExt, ResultExt, Snafu};
44

5-
use crate::commons::networking::DomainName;
5+
use crate::{commons::networking::DomainName, utils::cluster_domain};
66

77
const KUBERNETES_CLUSTER_DOMAIN_ENV: &str = "KUBERNETES_CLUSTER_DOMAIN";
88
const KUBERNETES_SERVICE_HOST_ENV: &str = "KUBERNETES_SERVICE_HOST";
@@ -92,11 +92,10 @@ pub(crate) fn retrieve_cluster_domain() -> Result<DomainName, Error> {
9292
DomainName::from_str(&cluster_domain).context(ParseDomainNameSnafu { cluster_domain })
9393
}
9494
Err(_) => {
95-
tracing::info!(
96-
cluster_domain = KUBERNETES_CLUSTER_DOMAIN_DEFAULT,
97-
"Using default Kubernetes cluster domain"
98-
);
99-
Ok(DomainName::from_str(KUBERNETES_CLUSTER_DOMAIN_DEFAULT).expect("stuff"))
95+
let cluster_domain = KUBERNETES_CLUSTER_DOMAIN_DEFAULT;
96+
tracing::info!(cluster_domain, "Using default Kubernetes cluster domain");
97+
DomainName::from_str(KUBERNETES_CLUSTER_DOMAIN_DEFAULT)
98+
.context(ParseDomainNameSnafu { cluster_domain })
10099
}
101100
}
102101
}

0 commit comments

Comments
 (0)