Revert to preferring IP addresses for Node listeners by default

Author: nightkr

Cargo.lock

@@ -34,3 +34,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 = "feature/smart-preferred-address-type" }

Cargo.nix

@@ -25,14 +25,17 @@ spec:
               description: Defines a policy for how [Listeners](https://docs.stackable.tech/home/nightly/listener-operator/listener) should be exposed. Read the [ListenerClass documentation](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass) for more information.
               properties:
                 preferredAddressType:
-                  default: Hostname
+                  default: HostnameConservative
                   description: |-
-                    Whether addresses should prefer using the IP address (`IP`) or the hostname (`Hostname`).
+                    Whether addresses should prefer using the IP address (`IP`) or the hostname (`Hostname`). Can also be set to `HostnameConservative`, which will use `IP` for `NodePort` service types, but `Hostname` for everything else.
 
-                    The other type will be used if the preferred type is not available. By default `Hostname` is used.
+                    The other type will be used if the preferred type is not available.
+
+                    Defaults to `HostnameConservative`.
                   enum:
                     - Hostname
                     - IP
+                    - HostnameConservative
                   type: string
                 serviceAnnotations:
                   additionalProperties:

Cargo.toml

@@ -464,7 +464,7 @@ async fn local_listener_addresses_for_pod(
             })?;
 
         Ok(node_primary_addresses(&node)
-            .pick(listener_class.spec.preferred_address_type)
+            .pick(listener_class.spec.resolve_preferred_address_type())
             .map(|(address, address_type)| ListenerIngress {
                 // nodes: Some(vec![node_name.to_string()]),
                 address: address.to_string(),

crate-hashes.json

@@ -364,6 +364,7 @@ pub async fn reconcile(
         .add(&ctx.client, svc)
         .await
         .context(ApplyServiceSnafu { svc: svc_ref })?;
+    let preferred_address_type = listener_class.spec.resolve_preferred_address_type();
 
     let nodes: Vec<Node>;
     let kubernetes_service_fqdn: String;
@@ -384,9 +385,7 @@ pub async fn reconcile(
             .await?;
             addresses = nodes
                 .iter()
-                .flat_map(|node| {
-                    node_primary_addresses(node).pick(listener_class.spec.preferred_address_type)
-                })
+                .flat_map(|node| node_primary_addresses(node).pick(preferred_address_type))
                 .collect::<Vec<_>>();
             ports = svc
                 .spec
@@ -408,7 +407,7 @@ pub async fn reconcile(
                         ip: ingress.ip.as_deref(),
                         hostname: ingress.hostname.as_deref(),
                     }
-                    .pick(listener_class.spec.preferred_address_type)
+                    .pick(preferred_address_type)
                 })
                 .collect();
             ports = svc
@@ -422,7 +421,7 @@ pub async fn reconcile(
         }
         ServiceType::ClusterIP => {
             let cluster_domain = &cluster_info.cluster_domain;
-            addresses = match listener_class.spec.preferred_address_type {
+            addresses = match preferred_address_type {
                 AddressType::Ip => svc
                     .spec
                     .iter()