replaced listener-class enum with string

Author: adwk67

deploy/helm/hbase-operator/crds/crds.yaml

@@ -198,10 +198,6 @@ spec:
                           type: string
                         listenerClass:
                           description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                          enum:
-                            - cluster-internal
-                            - external-unstable
-                            - external-stable
                           nullable: true
                           type: string
                         logging:
@@ -456,10 +452,6 @@ spec:
                                 type: string
                               listenerClass:
                                 description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                                enum:
-                                  - cluster-internal
-                                  - external-unstable
-                                  - external-stable
                                 nullable: true
                                 type: string
                               logging:
@@ -695,10 +687,6 @@ spec:
                           type: string
                         listenerClass:
                           description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                          enum:
-                            - cluster-internal
-                            - external-unstable
-                            - external-stable
                           nullable: true
                           type: string
                         logging:
@@ -981,10 +969,6 @@ spec:
                                 type: string
                               listenerClass:
                                 description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                                enum:
-                                  - cluster-internal
-                                  - external-unstable
-                                  - external-stable
                                 nullable: true
                                 type: string
                               logging:
@@ -1248,10 +1232,6 @@ spec:
                           type: string
                         listenerClass:
                           description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                          enum:
-                            - cluster-internal
-                            - external-unstable
-                            - external-stable
                           nullable: true
                           type: string
                         logging:
@@ -1506,10 +1486,6 @@ spec:
                                 type: string
                               listenerClass:
                                 description: This field controls which [ListenerClass](https://docs.stackable.tech/home/nightly/listener-operator/listenerclass.html) is used to expose this rolegroup.
-                                enum:
-                                  - cluster-internal
-                                  - external-unstable
-                                  - external-stable
                                 nullable: true
                                 type: string
                               logging:

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

@@ -85,9 +85,6 @@ pub const HBASE_REST_UI_PORT: u16 = 8085;
 // This port is only used by Hbase prior to version 2.6 with a third-party JMX exporter.
 // Newer versions use the same port as the UI because Hbase provides it's own metrics API
 pub const METRICS_PORT: u16 = 9100;
-
-pub const DEFAULT_LISTENER_CLASS: SupportedListenerClasses =
-    SupportedListenerClasses::ClusterInternal;
 pub const LISTENER_VOLUME_NAME: &str = "listener";
 pub const LISTENER_VOLUME_DIR: &str = "/stackable/listener";
 
@@ -600,9 +597,6 @@ impl v1alpha1::HbaseCluster {
                 // Order rolegroups consistently, to avoid spurious downstream rewrites
                 .collect::<BTreeMap<_, _>>()
                 .into_iter()
-                .filter(|(rolegroup_name, _)| {
-                    self.resolved_listener_class_discoverable(role, rolegroup_name)
-                })
                 .map(|(rolegroup_name, role_group)| {
                     (
                         self.rolegroup_ref(HbaseRole::Master.to_string(), rolegroup_name),
@@ -618,9 +612,6 @@ impl v1alpha1::HbaseCluster {
                 // Order rolegroups consistently, to avoid spurious downstream rewrites
                 .collect::<BTreeMap<_, _>>()
                 .into_iter()
-                .filter(|(rolegroup_name, _)| {
-                    self.resolved_listener_class_discoverable(role, rolegroup_name)
-                })
                 .map(|(rolegroup_name, role_group)| {
                     (
                         self.rolegroup_ref(HbaseRole::RegionServer.to_string(), rolegroup_name),
@@ -636,9 +627,6 @@ impl v1alpha1::HbaseCluster {
                 // Order rolegroups consistently, to avoid spurious downstream rewrites
                 .collect::<BTreeMap<_, _>>()
                 .into_iter()
-                .filter(|(rolegroup_name, _)| {
-                    self.resolved_listener_class_discoverable(role, rolegroup_name)
-                })
                 .map(|(rolegroup_name, role_group)| {
                     (
                         self.rolegroup_ref(HbaseRole::RestServer.to_string(), rolegroup_name),
@@ -649,19 +637,6 @@ impl v1alpha1::HbaseCluster {
         }
     }
 
-    fn resolved_listener_class_discoverable(
-        &self,
-        role: &HbaseRole,
-        rolegroup_name: &&String,
-    ) -> bool {
-        let listener_class = self.merged_listener_class(role, rolegroup_name);
-        if let Some(listener_class) = listener_class {
-            listener_class.discoverable()
-        } else {
-            false
-        }
-    }
-
     pub fn pod_refs(
         &self,
         role: &HbaseRole,
@@ -736,72 +711,6 @@ impl v1alpha1::HbaseCluster {
         }))
         .await
     }
-
-    pub fn merged_listener_class(
-        &self,
-        role: &HbaseRole,
-        rolegroup_name: &String,
-    ) -> Option<SupportedListenerClasses> {
-        match role {
-            HbaseRole::Master => {
-                if let Some(masters) = self.spec.masters.as_ref() {
-                    let conf_defaults = Some(SupportedListenerClasses::ClusterInternal);
-                    let mut conf_role = masters.config.config.listener_class.to_owned();
-                    let mut conf_rolegroup = masters
-                        .role_groups
-                        .get(rolegroup_name)
-                        .map(|rg| rg.config.config.listener_class.clone())
-                        .unwrap_or_default();
-
-                    conf_role.merge(&conf_defaults);
-                    conf_rolegroup.merge(&conf_role);
-
-                    tracing::debug!("Merged listener-class: {:?} for {role}", conf_rolegroup);
-                    conf_rolegroup
-                } else {
-                    None
-                }
-            }
-            HbaseRole::RegionServer => {
-                if let Some(region_servers) = self.spec.region_servers.as_ref() {
-                    let conf_defaults = Some(SupportedListenerClasses::ClusterInternal);
-                    let mut conf_role = region_servers.config.config.listener_class.to_owned();
-                    let mut conf_rolegroup = region_servers
-                        .role_groups
-                        .get(rolegroup_name)
-                        .map(|rg| rg.config.config.listener_class.clone())
-                        .unwrap_or_default();
-
-                    conf_role.merge(&conf_defaults);
-                    conf_rolegroup.merge(&conf_role);
-
-                    tracing::debug!("Merged listener-class: {:?} for {role}", conf_rolegroup);
-                    conf_rolegroup
-                } else {
-                    None
-                }
-            }
-            HbaseRole::RestServer => {
-                if let Some(rest_servers) = self.spec.rest_servers.as_ref() {
-                    let conf_defaults = Some(SupportedListenerClasses::ClusterInternal);
-                    let mut conf_role = rest_servers.config.config.listener_class.to_owned();
-                    let mut conf_rolegroup = rest_servers
-                        .role_groups
-                        .get(rolegroup_name)
-                        .map(|rg| rg.config.config.listener_class.clone())
-                        .unwrap_or_default();
-
-                    conf_role.merge(&conf_defaults);
-                    conf_rolegroup.merge(&conf_role);
-
-                    tracing::debug!("Merged listener-class: {:?} for {role}", conf_rolegroup);
-                    conf_rolegroup
-                } else {
-                    None
-                }
-            }
-        }
-    }
 }
 
 /// Reference to a single `Pod` that is a component of a [`HbaseCluster`]
@@ -972,7 +881,7 @@ impl HbaseRole {
             affinity: get_affinity(cluster_name, self, hdfs_discovery_cm_name),
             graceful_shutdown_timeout: Some(graceful_shutdown_timeout),
             requested_secret_lifetime: Some(requested_secret_lifetime),
-            listener_class: Some(DEFAULT_LISTENER_CLASS),
+            listener_class: Some("cluster-internal".to_string()),
         }
     }
 
@@ -1073,7 +982,7 @@ impl AnyConfigFragment {
                         cli_opts: None,
                     },
                     requested_secret_lifetime: Some(HbaseRole::DEFAULT_REGION_SECRET_LIFETIME),
-                    listener_class: Some(DEFAULT_LISTENER_CLASS),
+                    listener_class: Some("cluster-internal".to_string()),
                 })
             }
             HbaseRole::RestServer => AnyConfigFragment::RestServer(HbaseConfigFragment {
@@ -1085,7 +994,7 @@ impl AnyConfigFragment {
                     HbaseRole::DEFAULT_REST_SERVER_GRACEFUL_SHUTDOWN_TIMEOUT,
                 ),
                 requested_secret_lifetime: Some(HbaseRole::DEFAULT_REST_SECRET_LIFETIME),
-                listener_class: Some(DEFAULT_LISTENER_CLASS),
+                listener_class: Some("cluster-internal".to_string()),
             }),
             HbaseRole::Master => AnyConfigFragment::Master(HbaseConfigFragment {
                 hbase_rootdir: None,
@@ -1096,7 +1005,7 @@ impl AnyConfigFragment {
                     HbaseRole::DEFAULT_MASTER_GRACEFUL_SHUTDOWN_TIMEOUT,
                 ),
                 requested_secret_lifetime: Some(HbaseRole::DEFAULT_MASTER_SECRET_LIFETIME),
-                listener_class: Some(DEFAULT_LISTENER_CLASS),
+                listener_class: Some("cluster-internal".to_string()),
             }),
         }
     }
@@ -1176,7 +1085,7 @@ pub struct HbaseConfig {
     pub requested_secret_lifetime: Option<Duration>,
 
     /// This field controls which [ListenerClass](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass.html) is used to expose this rolegroup.
-    pub listener_class: SupportedListenerClasses,
+    pub listener_class: String,
 }
 
 impl Configuration for HbaseConfigFragment {
@@ -1328,7 +1237,7 @@ pub struct RegionServerConfig {
     pub region_mover: RegionMover,
 
     /// This field controls which [ListenerClass](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass.html) is used to expose this rolegroup.
-    pub listener_class: SupportedListenerClasses,
+    pub listener_class: String,
 }
 
 impl Configuration for RegionServerConfigFragment {
@@ -1396,35 +1305,6 @@ impl Configuration for RegionServerConfigFragment {
     }
 }
 
-#[derive(Clone, Debug, Default, Display, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum SupportedListenerClasses {
-    #[default]
-    #[serde(rename = "cluster-internal")]
-    #[strum(serialize = "cluster-internal")]
-    ClusterInternal,
-
-    #[serde(rename = "external-unstable")]
-    #[strum(serialize = "external-unstable")]
-    ExternalUnstable,
-
-    #[serde(rename = "external-stable")]
-    #[strum(serialize = "external-stable")]
-    ExternalStable,
-}
-
-impl Atomic for SupportedListenerClasses {}
-
-impl SupportedListenerClasses {
-    pub fn discoverable(&self) -> bool {
-        match self {
-            SupportedListenerClasses::ClusterInternal => false,
-            SupportedListenerClasses::ExternalUnstable => true,
-            SupportedListenerClasses::ExternalStable => true,
-        }
-    }
-}
-
 #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct HbaseClusterStatus {
@@ -1479,7 +1359,7 @@ impl AnyServiceConfig {
         }
     }
 
-    pub fn listener_class(&self) -> SupportedListenerClasses {
+    pub fn listener_class(&self) -> String {
         match self {
             AnyServiceConfig::Master(config) => config.listener_class.clone(),
             AnyServiceConfig::RegionServer(config) => config.listener_class.clone(),

rust/operator-binary/src/hbase_controller.rs

@@ -777,7 +777,7 @@ fn build_rolegroup_service(
 
     let metadata = ObjectMetaBuilder::new()
         .name_and_namespace(hbase)
-        .name(rolegroup.object_name())
+        .name(format!("{name}-metrics", name = rolegroup.object_name()))
         .ownerreference_from_resource(hbase, None, Some(true))
         .context(ObjectMissingMetadataForOwnerRefSnafu)?
         .with_recommended_labels(build_recommended_labels(
@@ -915,6 +915,12 @@ fn build_rolegroup_statefulset(
     let role_name = hbase_role.cli_role_name();
     let mut hbase_container = ContainerBuilder::new("hbase").expect("ContainerBuilder not created");
 
+    let rest_http_port_name = if hbase.has_https_enabled() {
+        HBASE_REST_PORT_NAME_HTTPS
+    } else {
+        HBASE_REST_PORT_NAME_HTTP
+    };
+
     hbase_container
         .image_from_product_image(resolved_product_image)
         .command(command())
@@ -924,11 +930,11 @@ fn build_rolegroup_statefulset(
             role = role_name,
             domain = hbase_service_domain_name(hbase, rolegroup_ref, cluster_info)?,
             port = hbase.service_port(hbase_role).to_string(),
-                               port_name = match hbase_role {
-                                HbaseRole::Master => "master",
-                                HbaseRole::RegionServer => "regionserver",
-                                HbaseRole::RestServer => "rest-http",
-                               }
+            port_name = match hbase_role {
+                HbaseRole::Master => "master",
+                HbaseRole::RegionServer => "regionserver",
+                HbaseRole::RestServer => rest_http_port_name,
+            }
         }])
         .add_env_vars(merged_env)
         // Needed for the `containerdebug` process to log it's tracing information to.
@@ -1001,26 +1007,13 @@ fn build_rolegroup_statefulset(
         .security_context(PodSecurityContextBuilder::new().fs_group(1000).build());
 
     // externally-reachable listener endpoints should use a pvc volume...
-    let pvcs = if merged_config.listener_class().discoverable() {
-        let pvc = ListenerOperatorVolumeSourceBuilder::new(
-            &ListenerReference::ListenerClass(merged_config.listener_class().to_string()),
-            &recommended_labels,
-        )
-        .context(BuildListenerVolumeSnafu)?
-        .build_pvc(LISTENER_VOLUME_NAME.to_string())
-        .context(BuildListenerVolumeSnafu)?;
-        Some(vec![pvc])
-    } else {
-        // ...whereas others will use ephemeral volumes
-        pod_builder
-            .add_listener_volume_by_listener_class(
-                LISTENER_VOLUME_NAME,
-                &merged_config.listener_class().to_string(),
-                &recommended_labels,
-            )
-            .context(AddVolumeSnafu)?;
-        None
-    };
+    let pvc = ListenerOperatorVolumeSourceBuilder::new(
+        &ListenerReference::ListenerClass(merged_config.listener_class().to_string()),
+        &recommended_labels,
+    )
+    .context(BuildListenerVolumeSnafu)?
+    .build_pvc(LISTENER_VOLUME_NAME.to_string())
+    .context(BuildListenerVolumeSnafu)?;
 
     if let Some(ContainerLogConfig {
         choice:
@@ -1124,9 +1117,12 @@ fn build_rolegroup_statefulset(
             match_labels: Some(statefulset_match_labels.into()),
             ..LabelSelector::default()
         },
-        service_name: Some(rolegroup_ref.object_name()),
+        service_name: Some(format!(
+            "{name}-metrics",
+            name = rolegroup_ref.object_name()
+        )),
         template: pod_template,
-        volume_claim_templates: pvcs,
+        volume_claim_templates: Some(vec![pvc]),
         ..StatefulSetSpec::default()
     };