rename dummy* to default* and cleanup

Author: razvan

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

@@ -12,7 +12,7 @@ use super::crd::CONNECT_EXECUTOR_ROLE_NAME;
 use crate::{
     connect::crd::{
         CONNECT_APP_NAME, CONNECT_CONTROLLER_NAME, CONNECT_SERVER_ROLE_NAME,
-        DUMMY_SPARK_CONNECT_GROUP_NAME,
+        DEFAULT_SPARK_CONNECT_GROUP_NAME,
     },
     crd::constants::OPERATOR_NAME,
 };
@@ -53,7 +53,7 @@ pub(crate) fn labels<'a, T>(
         operator_name: OPERATOR_NAME,
         controller_name: CONNECT_CONTROLLER_NAME,
         role,
-        role_group: DUMMY_SPARK_CONNECT_GROUP_NAME,
+        role_group: DEFAULT_SPARK_CONNECT_GROUP_NAME,
     }
 }
 

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

@@ -45,7 +45,7 @@ pub const CONNECT_EXECUTOR_ROLE_NAME: &str = "executor";
 pub const CONNECT_GRPC_PORT: i32 = 15002;
 pub const CONNECT_UI_PORT: i32 = 4040;
 
-pub const DUMMY_SPARK_CONNECT_GROUP_NAME: &str = "default";
+pub const DEFAULT_SPARK_CONNECT_GROUP_NAME: &str = "default";
 
 pub const CONNECT_APP_NAME: &str = "spark-connect";
 

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

@@ -23,7 +23,7 @@ use stackable_operator::{
 
 use super::{
     common::{SparkConnectRole, object_name},
-    crd::{DUMMY_SPARK_CONNECT_GROUP_NAME, SparkConnectContainer},
+    crd::{DEFAULT_SPARK_CONNECT_GROUP_NAME, SparkConnectContainer},
 };
 use crate::{
     connect::{common, crd::v1alpha1},
@@ -354,7 +354,7 @@ pub(crate) fn executor_config_map(
     let role_group_ref = RoleGroupRef {
         cluster: ObjectRef::from_obj(scs),
         role: SparkConnectRole::Executor.to_string(),
-        role_group: DUMMY_SPARK_CONNECT_GROUP_NAME.to_string(),
+        role_group: DEFAULT_SPARK_CONNECT_GROUP_NAME.to_string(),
     };
     product_logging::extend_config_map(
         &role_group_ref,

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

@@ -40,7 +40,7 @@ use crate::{
     connect::{
         common::{self, SparkConnectRole, object_name},
         crd::{
-            CONNECT_GRPC_PORT, CONNECT_UI_PORT, DUMMY_SPARK_CONNECT_GROUP_NAME,
+            CONNECT_GRPC_PORT, CONNECT_UI_PORT, DEFAULT_SPARK_CONNECT_GROUP_NAME,
             SparkConnectContainer, v1alpha1,
         },
     },
@@ -189,7 +189,7 @@ pub(crate) fn server_config_map(
         .add_data(JVM_SECURITY_PROPERTIES_FILE, jvm_sec_props)
         .add_data(METRICS_PROPERTIES_FILE, metrics_props);
 
-    let role_group_ref = dummy_role_group_ref(scs);
+    let role_group_ref = default_role_group_ref(scs);
     product_logging::extend_config_map(
         &role_group_ref,
         &config.logging,
@@ -337,7 +337,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(dummy_role_group_ref(scs).object_name()),
+            &ListenerReference::ListenerName(default_role_group_ref(scs).object_name()),
             &recommended_labels,
         )
         .context(BuildListenerVolumeSnafu)?
@@ -380,7 +380,7 @@ pub(crate) fn build_stateful_set(
                         scs,
                         CONNECT_APP_NAME,
                         &SparkConnectRole::Server.to_string(),
-                        DUMMY_SPARK_CONNECT_GROUP_NAME,
+                        DEFAULT_SPARK_CONNECT_GROUP_NAME,
                     )
                     .context(LabelBuildSnafu)?
                     .into(),
@@ -613,14 +613,13 @@ fn probe() -> Probe {
     }
 }
 
-// TODO: remove this and all rolegroup references
-fn dummy_role_group_ref(
+fn default_role_group_ref(
     scs: &v1alpha1::SparkConnectServer,
 ) -> RoleGroupRef<v1alpha1::SparkConnectServer> {
     RoleGroupRef {
         cluster: ObjectRef::from_obj(scs),
         role: SparkConnectRole::Server.to_string(),
-        role_group: DUMMY_SPARK_CONNECT_GROUP_NAME.to_string(),
+        role_group: DEFAULT_SPARK_CONNECT_GROUP_NAME.to_string(),
     }
 }
 
@@ -629,8 +628,7 @@ pub(crate) fn build_listener(
     role_config: &v1alpha1::SparkConnectServerRoleConfig,
     resolved_product_image: &ResolvedProductImage,
 ) -> Result<listener::v1alpha1::Listener, Error> {
-    //let listener_name = server_listener_name(scs);
-    let listener_name = dummy_role_group_ref(scs).object_name();
+    let listener_name = default_role_group_ref(scs).object_name();
 
     let listener_class = role_config.listener_class.clone();
     let role = SparkConnectRole::Server.to_string();
@@ -659,10 +657,3 @@ pub(crate) fn build_listener(
     )
     .context(BuildListenerSnafu)
 }
-
-fn server_listener_name(scs: &v1alpha1::SparkConnectServer) -> String {
-    format!(
-        "{cluster_name}-server",
-        cluster_name = ObjectRef::from_obj(scs)
-    )
-}