changes in line with decision 51: metrics exposed separately, no extra suffix for node service

Author: adwk67

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

@@ -486,7 +486,7 @@ impl v1alpha1::SupersetCluster {
     /// The UI will use this group listener so that only one load balancer
     /// is needed (per role group).
     pub fn group_listener_name(&self, rolegroup: &RoleGroupRef<Self>) -> String {
-        format!("{rolegroup}-group", rolegroup = rolegroup.object_name())
+        rolegroup.object_name()
     }
 
     pub fn get_role(&self, role: &SupersetRole) -> Option<&Role<v1alpha1::SupersetConfigFragment>> {
@@ -495,11 +495,6 @@ impl v1alpha1::SupersetCluster {
         }
     }
 
-    /// The name of the role-level load-balanced Kubernetes `Service`
-    pub fn node_role_service_name(&self) -> Option<String> {
-        self.metadata.name.clone()
-    }
-
     /// Metadata about a node rolegroup
     pub fn node_rolegroup_ref(
         &self,

rust/operator-binary/src/superset_controller.rs

@@ -621,55 +621,48 @@ fn build_node_rolegroup_service(
     resolved_product_image: &ResolvedProductImage,
     rolegroup: &RoleGroupRef<SupersetCluster>,
 ) -> Result<Service> {
-    Ok(Service {
-        metadata: ObjectMetaBuilder::new()
-            .name_and_namespace(superset)
-            .name(rolegroup.object_name())
-            .ownerreference_from_resource(superset, None, Some(true))
-            .context(ObjectMissingMetadataForOwnerRefSnafu)?
-            .with_recommended_labels(build_recommended_labels(
-                superset,
-                SUPERSET_CONTROLLER_NAME,
-                &resolved_product_image.app_version_label,
-                &rolegroup.role,
-                &rolegroup.role_group,
-            ))
-            .context(MetadataBuildSnafu)?
-            .with_label(Label::try_from(("prometheus.io/scrape", "true")).context(LabelBuildSnafu)?)
-            .build(),
-        spec: Some(ServiceSpec {
-            // Internal communication does not need to be exposed
-            type_: Some("ClusterIP".to_owned()),
-            cluster_ip: Some("None".to_owned()),
-            ports: Some(vec![
-                ServicePort {
-                    name: Some(APP_PORT_NAME.to_owned()),
-                    port: APP_PORT.into(),
-                    protocol: Some("TCP".to_owned()),
-                    ..ServicePort::default()
-                },
-                ServicePort {
-                    name: Some(METRICS_PORT_NAME.to_owned()),
-                    port: METRICS_PORT.into(),
-                    protocol: Some("TCP".to_owned()),
-                    ..ServicePort::default()
-                },
-            ]),
-            selector: Some(
-                Labels::role_group_selector(
-                    superset,
-                    APP_NAME,
-                    &rolegroup.role,
-                    &rolegroup.role_group,
-                )
+    let metadata = ObjectMetaBuilder::new()
+        .name_and_namespace(superset)
+        .name(format!("{name}-metrics", name = rolegroup.object_name()))
+        .ownerreference_from_resource(superset, None, Some(true))
+        .context(ObjectMissingMetadataForOwnerRefSnafu)?
+        .with_recommended_labels(build_recommended_labels(
+            superset,
+            SUPERSET_CONTROLLER_NAME,
+            &resolved_product_image.app_version_label,
+            &rolegroup.role,
+            &rolegroup.role_group,
+        ))
+        .context(MetadataBuildSnafu)?
+        .with_label(Label::try_from(("prometheus.io/scrape", "true")).context(LabelBuildSnafu)?)
+        .build();
+
+    let spec = Some(ServiceSpec {
+        // Internal communication does not need to be exposed
+        type_: Some("ClusterIP".to_owned()),
+        cluster_ip: Some("None".to_owned()),
+        ports: Some(vec![ServicePort {
+            name: Some(METRICS_PORT_NAME.to_owned()),
+            port: METRICS_PORT.into(),
+            protocol: Some("TCP".to_owned()),
+            ..ServicePort::default()
+        }]),
+        selector: Some(
+            Labels::role_group_selector(superset, APP_NAME, &rolegroup.role, &rolegroup.role_group)
                 .context(LabelBuildSnafu)?
                 .into(),
-            ),
-            publish_not_ready_addresses: Some(true),
-            ..ServiceSpec::default()
-        }),
+        ),
+        publish_not_ready_addresses: Some(true),
+        ..ServiceSpec::default()
+    });
+
+    let service = Service {
+        metadata,
+        spec,
         status: None,
-    })
+    };
+
+    Ok(service)
 }
 
 pub fn build_group_listener(

tests/templates/kuttl/external-access/30-assert.yaml

@@ -43,20 +43,20 @@ status:
 apiVersion: v1
 kind: Service
 metadata:
-  name: superset-node-cluster-internal-group
+  name: superset-node-cluster-internal
 spec:
   type: ClusterIP # cluster-internal
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: superset-node-default-group
+  name: superset-node-default
 spec:
   type: NodePort # external-stable
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: superset-node-external-unstable-group
+  name: superset-node-external-unstable
 spec:
   type: NodePort # external-unstable

tests/templates/kuttl/smoke/metrics.py

@@ -8,7 +8,7 @@
 # Wait for the counter to be consumed by the statsd-exporter
 time.sleep(2)
 
-metrics_response = requests.get("http://superset-node-default:9102/metrics")
+metrics_response = requests.get("http://superset-node-default-metrics:9102/metrics")
 assert metrics_response.status_code == 200, "Metrics could not be retrieved."
 
 assert "superset_welcome" in metrics_response.text, (