consolidate listener / service names

Author: maltesander

rust/operator-binary/src/connect/controller.rs

@@ -205,7 +205,7 @@ pub async fn reconcile(
     let service = server::build_internal_service(scs, &resolved_product_image.app_version_label)
         .context(BuildServiceSnafu)?;
 
-    cluster_resources
+    let applied_internal_service = cluster_resources
         .add(client, service.clone())
         .await
         .context(ApplyServiceSnafu)?;
@@ -217,7 +217,7 @@ pub async fn reconcile(
         server::server_properties(
             scs,
             &server_config,
-            &service,
+            &applied_internal_service,
             &service_account,
             &resolved_product_image,
         )
@@ -272,6 +272,16 @@ pub async fn reconcile(
             name: scs.name_unchecked(),
         })?;
 
+    // ========================================
+    // Server listener
+    let listener = server::build_listener(scs, server_role_config, &resolved_product_image)
+        .context(BuildListenerSnafu)?;
+
+    let applied_listener = cluster_resources
+        .add(client, listener)
+        .await
+        .context(ApplyListenerSnafu)?;
+
     // ========================================
     // Server stateful set
     let args = server::command_args(&scs.spec.args);
@@ -281,20 +291,11 @@ pub async fn reconcile(
         &resolved_product_image,
         &service_account,
         &server_config_map,
+        &applied_listener.name_any(),
         args,
     )
     .context(BuildServerStatefulSetSnafu)?;
 
-    // ========================================
-    // Server listener
-    let listener = server::build_listener(scs, server_role_config, &resolved_product_image)
-        .context(BuildListenerSnafu)?;
-
-    cluster_resources
-        .add(client, listener)
-        .await
-        .context(ApplyListenerSnafu)?;
-
     let mut ss_cond_builder = StatefulSetConditionBuilder::default();
 
     ss_cond_builder.add(

rust/operator-binary/src/connect/server.rs

@@ -212,6 +212,7 @@ pub(crate) fn build_stateful_set(
     resolved_product_image: &ResolvedProductImage,
     service_account: &ServiceAccount,
     config_map: &ConfigMap,
+    listener_name: &str,
     args: Vec<String>,
 ) -> Result<StatefulSet, Error> {
     let server_role = SparkConnectRole::Server.to_string();
@@ -337,7 +338,7 @@ pub(crate) fn build_stateful_set(
     // cluster-internal) as the address should still be consistent.
     let volume_claim_templates = Some(vec![
         ListenerOperatorVolumeSourceBuilder::new(
-            &ListenerReference::ListenerName(default_role_group_ref(scs).object_name()),
+            &ListenerReference::ListenerName(listener_name.to_string()),
             &recommended_labels,
         )
         .context(BuildListenerVolumeSnafu)?
@@ -399,7 +400,11 @@ pub(crate) fn build_internal_service(
     scs: &v1alpha1::SparkConnectServer,
     app_version_label: &str,
 ) -> Result<Service, Error> {
-    let service_name = object_name(&scs.name_any(), SparkConnectRole::Server);
+    let service_name = format!(
+        "{cluster}-{role}-headless",
+        cluster = scs.name_any(),
+        role = SparkConnectRole::Server
+    );
 
     let selector =
         Labels::role_selector(scs, CONNECT_APP_NAME, &SparkConnectRole::Server.to_string())
@@ -628,7 +633,7 @@ pub(crate) fn build_listener(
     role_config: &v1alpha1::SparkConnectServerRoleConfig,
     resolved_product_image: &ResolvedProductImage,
 ) -> Result<listener::v1alpha1::Listener, Error> {
-    let listener_name = default_role_group_ref(scs).object_name();
+    let listener_name = format!("{cluster}-server", cluster = scs.name_any());
 
     let listener_class = role_config.listener_class.clone();
     let role = SparkConnectRole::Server.to_string();

tests/templates/kuttl/spark-connect/10-assert.yaml

@@ -17,6 +17,13 @@ metadata:
 spec:
   type: NodePort
 ---
+apiVersion: v1
+kind: Service
+metadata:
+  name: spark-connect-server-headless
+spec:
+  type: ClusterIP  
+---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 timeout: 300

tests/templates/kuttl/spark-connect/20-run-connect-client.yaml.j2

@@ -67,7 +67,7 @@ spec:
             [
               "/usr/bin/python",
               "/app/example.py",
-              "sc://spark-connect-server-default",
+              "sc://spark-connect-server",
             ]
           resources:
             limits: