Use automatic cluster domain detection

Author: nightkr

Cargo.lock

@@ -39,3 +39,4 @@ walkdir = "2.5.0"
 [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 = "feature/cluster-detection-local-kubelet" }

Cargo.nix

@@ -42,6 +42,10 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
+            - name: KUBERNETES_NODE_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: spec.nodeName
             {{- if .Values.kubernetesClusterDomain }}
             - name: KUBERNETES_CLUSTER_DOMAIN
               value: {{ .Values.kubernetesClusterDomain | quote }}

Cargo.toml

@@ -41,7 +41,7 @@ spec:
           env:
             - name: CSI_ENDPOINT
               value: /csi/csi.sock
-            - name: NODE_NAME
+            - name: KUBERNETES_NODE_NAME
               valueFrom:
                 fieldRef:
                   apiVersion: v1

crate-hashes.json

@@ -83,6 +83,12 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - ""
+    resources:
+      - nodes/proxy
+    verbs:
+      - get
   - apiGroups:
       - storage.k8s.io
     resources:

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

@@ -11,7 +11,10 @@ use csi_server::{
 use futures::{FutureExt, TryStreamExt, pin_mut};
 use stackable_operator::{
     self, YamlSchema,
-    crd::listener::{Listener, ListenerClass, PodListeners},
+    crd::listener::{
+        Listener, ListenerClass, ListenerClassVersion, ListenerVersion, PodListeners,
+        PodListenersVersion,
+    },
     shared::yaml::SerializeOptions,
     telemetry::{Tracing, tracing::TelemetryOptions},
     utils::cluster_info::KubernetesClusterInfoOpts,
@@ -53,10 +56,7 @@ struct ListenerOperatorRun {
 #[derive(Debug, clap::Parser, strum::AsRefStr, strum::Display)]
 enum RunMode {
     Controller,
-    Node {
-        #[clap(long, env)]
-        node_name: String,
-    },
+    Node,
 }
 
 mod built_info {
@@ -71,11 +71,11 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         stackable_operator::cli::Command::Crd => {
-            ListenerClass::merged_crd(ListenerClass::V1Alpha1)?
+            ListenerClass::merged_crd(ListenerClassVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            Listener::merged_crd(Listener::V1Alpha1)?
+            Listener::merged_crd(ListenerVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
-            PodListeners::merged_crd(PodListeners::V1Alpha1)?
+            PodListeners::merged_crd(PodListenersVersion::V1Alpha1)?
                 .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         stackable_operator::cli::Command::Run(ListenerOperatorRun {
@@ -137,11 +137,11 @@ async fn main() -> anyhow::Result<()> {
                         .await
                         .map_err(|err| err.factor_first().0)?;
                 }
-                RunMode::Node { node_name } => {
+                RunMode::Node => {
                     csi_server
                         .add_service(NodeServer::new(ListenerOperatorNode {
                             client: client.clone(),
-                            node_name,
+                            node_name: cluster_info_opts.kubernetes_node_name,
                         }))
                         .serve_with_incoming_shutdown(csi_listener, sigterm.recv().map(|_| ()))
                         .await?;