adapt to op-rs 0.80.0

Author: maltesander

CHANGELOG.md

@@ -6,9 +6,8 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
-- The operator can now run on Kubernetes clusters using a non-default cluster domain. It should automatically detect the
-  correct domain to use, but you can also use the env var `KUBERNETES_CLUSTER_DOMAIN` to set the domain explicitly
-  or use the helm-chart property `kubernetesClusterDomain` ([#870]).
+- The operator can now run on Kubernetes clusters using a non-default cluster domain.
+  Use the env var `KUBERNETES_CLUSTER_DOMAIN` or the operator Helm chart property `kubernetesClusterDomain` to set a non-default cluster domain ([#870]).
 
 ### Changed
 

Cargo.lock

@@ -22,7 +22,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"] }

Cargo.toml

@@ -48,7 +48,6 @@ tolerations: []
 
 affinity: {}
 
-# When running on a non-default Kubernetes cluster domain and the auto detection is not working correctly,
-# you can set your custom cluster domain here.
-# See the https://docs.stackable.tech/home/stable/guides/kubernetes-cluster-domain guide for details
+# When running on a non-default Kubernetes cluster domain, the cluster domain can be configured here.
+# See the https://docs.stackable.tech/home/stable/guides/kubernetes-cluster-domain guide for details.
 # kubernetesClusterDomain: my-cluster.local

deploy/helm/zookeeper-operator/values.yaml

@@ -29,7 +29,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, IntoEnumIterator};
 
@@ -483,15 +483,12 @@ impl ZookeeperCluster {
     }
 
     /// The fully-qualified domain name of the role-level load-balanced Kubernetes `Service`
-    pub fn server_role_service_fqdn(&self) -> Option<String> {
-        let cluster_domain = KUBERNETES_CLUSTER_DOMAIN
-            .get()
-            .expect("KUBERNETES_CLUSTER_DOMAIN must first be set by calling initialize_operator");
+    pub fn server_role_service_fqdn(&self, cluster_info: &KubernetesClusterInfo) -> Option<String> {
         Some(format!(
-            "{}.{}.svc.{}",
-            self.server_role_service_name()?,
-            self.metadata.namespace.as_ref()?,
-            cluster_domain
+            "{role_service_name}.{namespace}.svc.{cluster_domain}",
+            role_service_name = self.server_role_service_name()?,
+            namespace = self.metadata.namespace.as_ref()?,
+            cluster_domain = cluster_info.cluster_domain
         ))
     }
 
@@ -671,13 +668,13 @@ pub struct ZookeeperPodRef {
 }
 
 impl ZookeeperPodRef {
-    pub fn fqdn(&self) -> String {
-        let cluster_domain = KUBERNETES_CLUSTER_DOMAIN
-            .get()
-            .expect("Could not resolve the Kubernetes cluster domain!");
+    pub fn fqdn(&self, cluster_info: &KubernetesClusterInfo) -> String {
         format!(
-            "{}.{}.{}.svc.{}",
-            self.pod_name, self.role_group_service_name, self.namespace, cluster_domain
+            "{pod_name}.{service_name}.{namespace}.svc.{cluster_domain}",
+            pod_name = self.pod_name,
+            service_name = self.role_group_service_name,
+            namespace = self.namespace,
+            cluster_domain = cluster_info.cluster_domain
         )
     }
 }

rust/crd/src/lib.rs

@@ -6,6 +6,7 @@ use stackable_operator::{
     commons::product_image_selection::ResolvedProductImage,
     k8s_openapi::api::core::v1::{ConfigMap, Endpoints, Service},
     kube::{runtime::reflector::ObjectRef, Resource, ResourceExt},
+    utils::cluster_info::KubernetesClusterInfo,
 };
 use stackable_zookeeper_crd::{security::ZookeeperSecurity, ZookeeperCluster, ZookeeperRole};
 
@@ -84,7 +85,7 @@ pub async fn build_discovery_configmaps(
         &namespace,
         controller_name,
         chroot,
-        pod_hosts(zk, zookeeper_security)?,
+        pod_hosts(zk, zookeeper_security, &client.kubernetes_cluster_info)?,
         resolved_product_image,
     )?];
     if zk.spec.cluster_config.listener_class
@@ -171,11 +172,12 @@ fn build_discovery_configmap(
 fn pod_hosts<'a>(
     zk: &'a ZookeeperCluster,
     zookeeper_security: &'a ZookeeperSecurity,
+    cluster_info: &'a KubernetesClusterInfo,
 ) -> Result<impl IntoIterator<Item = (String, u16)> + 'a> {
     Ok(zk
         .pods()
         .context(ExpectedPodsSnafu)?
-        .map(|pod_ref| (pod_ref.fqdn(), zookeeper_security.client_port())))
+        .map(|pod_ref| (pod_ref.fqdn(cluster_info), zookeeper_security.client_port())))
 }
 
 /// Lists all nodes currently hosting Pods participating in the [`Service`]

rust/operator-binary/src/discovery.rs

@@ -54,6 +54,7 @@ async fn main() -> anyhow::Result<()> {
             product_config,
             watch_namespace,
             tracing_target,
+            cluster_info_opts,
         }) => {
             stackable_operator::logging::initialize_logging(
                 "ZOOKEEPER_OPERATOR_LOG",
@@ -72,9 +73,11 @@ async fn main() -> anyhow::Result<()> {
                 "deploy/config-spec/properties.yaml",
                 "/etc/stackable/zookeeper-operator/config-spec/properties.yaml",
             ])?;
-            let client =
-                stackable_operator::client::initialize_operator(Some(OPERATOR_NAME.to_string()))
-                    .await?;
+            let client = stackable_operator::client::initialize_operator(
+                Some(OPERATOR_NAME.to_string()),
+                &cluster_info_opts,
+            )
+            .await?;
 
             let zk_controller_builder = Controller::new(
                 watch_namespace.get_api::<DeserializeGuard<ZookeeperCluster>>(&client),