adapt to op-rs 0.79.0

Author: maltesander

CHANGELOG.md

@@ -7,6 +7,9 @@ All notable changes to this project will be documented in this file.
 ### Added
 
 - `Listener.status.addresses` can now be configured to prefer either IP addresses or DNS hostnames ([#233]).
+- 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` ([#xxx]).
 
 ### Changed
 
@@ -22,6 +25,7 @@ All notable changes to this project will be documented in this file.
 [#231]: https://github.com/stackabletech/listener-operator/pull/231
 [#233]: https://github.com/stackabletech/listener-operator/pull/233
 [#234]: https://github.com/stackabletech/listener-operator/pull/234
+[#xxx]: https://github.com/stackabletech/listener-operator/pull/xxx
 
 ## [24.7.0] - 2024-07-24
 

Cargo.lock

@@ -21,7 +21,7 @@ prost = "0.13"
 prost-types = "0.13"
 serde = "1.0"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.78.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.79.0" }
 strum = { version = "0.26", features = ["derive"] }
 socket2 = { version = "0.5", features = ["all"] }
 tokio = { version = "1.40", features = ["full"] }
@@ -33,4 +33,4 @@ tracing = "0.1.40"
 
 [patch."https://github.com/stackabletech/operator-rs.git"]
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

Cargo.nix

@@ -42,6 +42,10 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
+            {{- if .Values.kubernetesClusterDomain }}
+            - name: KUBERNETES_CLUSTER_DOMAIN
+              value: {{ .Values.kubernetesClusterDomain | quote }}
+            {{- end }}              
           volumeMounts:
             - name: csi
               mountPath: /csi

Cargo.toml

@@ -46,6 +46,10 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
+            {{- if .Values.kubernetesClusterDomain }}
+            - name: KUBERNETES_CLUSTER_DOMAIN
+              value: {{ .Values.kubernetesClusterDomain | quote }}
+            {{- end }}                  
           volumeMounts:
             - name: csi
               mountPath: /csi

crate-hashes.json

@@ -92,6 +92,11 @@ 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
+# kubernetesClusterDomain: my-cluster.local
+
 # Kubelet dir may vary in environments such as microk8s, see https://github.com/stackabletech/secret-operator/issues/229
 kubeletDir: /var/lib/kubelet
 

deploy/helm/listener-operator/templates/controller-deployment.yaml

@@ -25,6 +25,7 @@ use stackable_operator::{
     },
     logging::controller::{report_controller_reconciled, ReconcilerError},
     time::Duration,
+    utils::cluster_domain::KUBERNETES_CLUSTER_DOMAIN,
 };
 use strum::IntoStaticStr;
 
@@ -328,6 +329,9 @@ pub async fn reconcile(listener: Arc<Listener>, ctx: Arc<Ctx>) -> Result<control
                 .collect();
         }
         ServiceType::ClusterIP => {
+            let cluster_domain = KUBERNETES_CLUSTER_DOMAIN.get().expect(
+                "KUBERNETES_CLUSTER_DOMAIN must first be set by calling initialize_operator",
+            );
             addresses = match listener_class.spec.preferred_address_type {
                 AddressType::Ip => svc
                     .spec
@@ -337,7 +341,7 @@ pub async fn reconcile(listener: Arc<Listener>, ctx: Arc<Ctx>) -> Result<control
                     .map(|addr| (&**addr, AddressType::Ip))
                     .collect::<Vec<_>>(),
                 AddressType::Hostname => {
-                    kubernetes_service_fqdn = format!("{svc_name}.{ns}.svc.cluster.local");
+                    kubernetes_service_fqdn = format!("{svc_name}.{ns}.svc.{cluster_domain}");
                     vec![(&kubernetes_service_fqdn, AddressType::Hostname)]
                 }
             };

deploy/helm/listener-operator/templates/node-daemonset.yaml

@@ -84,7 +84,8 @@ async fn main() -> anyhow::Result<()> {
                 built_info::RUSTC_VERSION,
             );
             let client =
-                stackable_operator::client::create_client(Some(OPERATOR_KEY.to_string())).await?;
+                stackable_operator::client::initialize_operator(Some(OPERATOR_KEY.to_string()))
+                    .await?;
             if csi_endpoint
                 .symlink_metadata()
                 .map_or(false, |meta| meta.file_type().is_socket())