use test ns-specific listener classes and simplify config use

Author: adwk67

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

@@ -563,30 +563,4 @@ impl v1alpha1::SupersetCluster {
         tracing::debug!("Merged config: {:?}", conf_rolegroup);
         fragment::validate(conf_rolegroup).context(FragmentValidationFailureSnafu)
     }
-
-    pub fn merged_listener_class(
-        &self,
-        role: &SupersetRole,
-        rolegroup_name: &String,
-    ) -> Result<Option<String>, Error> {
-        let listener_class_default = Some("cluster-internal".to_string());
-
-        let role = match role {
-            SupersetRole::Node => self.spec.nodes.as_ref().context(UnknownSupersetRoleSnafu {
-                role: role.to_string(),
-                roles: vec![role.to_string()],
-            })?,
-        };
-
-        let mut listener_class_role = role.config.config.listener_class.to_owned();
-        let mut listener_class_rolegroup = role
-            .role_groups
-            .get(rolegroup_name)
-            .map(|rg| rg.config.config.listener_class.clone())
-            .unwrap_or_default();
-        listener_class_role.merge(&listener_class_default);
-        listener_class_rolegroup.merge(&listener_class_role);
-        tracing::debug!("Merged listener-class: {:?}", listener_class_rolegroup);
-        Ok(listener_class_rolegroup)
-    }
 }

rust/operator-binary/src/superset_controller.rs

@@ -437,23 +437,18 @@ pub async fn reconcile_superset(
             &config,
         )?;
 
-        if let Some(listener_class) = superset
-            .merged_listener_class(&superset_role, &rolegroup.role_group)
-            .context(FailedToResolveConfigSnafu)?
-        {
-            let rg_group_listener = build_group_listener(
-                superset,
-                &resolved_product_image,
-                &rolegroup,
-                listener_class.to_string(),
-            )?;
-            cluster_resources
-                .add(client, rg_group_listener)
-                .await
-                .context(ApplyGroupListenerSnafu {
-                    rolegroup: rolegroup.clone(),
-                })?;
-        }
+        let rg_group_listener = build_group_listener(
+            superset,
+            &resolved_product_image,
+            &rolegroup,
+            config.listener_class,
+        )?;
+        cluster_resources
+            .add(client, rg_group_listener)
+            .await
+            .context(ApplyGroupListenerSnafu {
+                rolegroup: rolegroup.clone(),
+            })?;
 
         cluster_resources
             .add(client, rg_service)
@@ -708,18 +703,11 @@ pub fn build_group_listener(
 }
 
 fn listener_ports() -> Vec<ListenerPort> {
-    vec![
-        ListenerPort {
-            name: METRICS_PORT_NAME.to_string(),
-            port: METRICS_PORT.into(),
-            protocol: Some("TCP".to_string()),
-        },
-        ListenerPort {
-            name: APP_PORT_NAME.to_string(),
-            port: APP_PORT.into(),
-            protocol: Some("TCP".to_string()),
-        },
-    ]
+    vec![ListenerPort {
+        name: APP_PORT_NAME.to_string(),
+        port: APP_PORT.into(),
+        protocol: Some("TCP".to_string()),
+    }]
 }
 
 /// The rolegroup [`StatefulSet`] runs the rolegroup, as configured by the administrator.

tests/templates/kuttl/external-access/20-assert.yaml.j2

@@ -0,0 +1,6 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      envsubst < listener-classes.yaml | kubectl apply -n $NAMESPACE -f -

tests/templates/kuttl/external-access/20-install-vector-aggregator-discovery-configmap.yaml.j2

@@ -0,0 +1,8 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+timeout: 600
+commands:
+  - script: >
+      envsubst < install-superset.yaml |
+      kubectl apply -n $NAMESPACE -f -

tests/templates/kuttl/external-access/20-listener-classes.yaml

@@ -1,10 +1,4 @@
 ---
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-metadata:
-  name: install-superset
-timeout: 300
----
 apiVersion: v1
 kind: Secret
 metadata:
@@ -34,20 +28,17 @@ spec:
     pullPolicy: IfNotPresent
   clusterConfig:
     credentialsSecret: superset-credentials
-{% if lookup('env', 'VECTOR_AGGREGATOR') %}
-    vectorAggregatorConfigMapName: vector-aggregator-discovery
-{% endif %}
   nodes:
     config:
-      listenerClass: external-stable
+      listenerClass: test-external-stable-$NAMESPACE
     roleGroups:
       default:
         replicas: 2
       external-unstable:
         replicas: 1
         config:
-          listenerClass: external-unstable
+          listenerClass: test-external-unstable-$NAMESPACE
       cluster-internal:
         replicas: 1
         config:
-          listenerClass: cluster-internal
+          listenerClass: test-cluster-internal-$NAMESPACE

tests/templates/kuttl/external-access/30-install-superset.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: listeners.stackable.tech/v1alpha1
+kind: ListenerClass
+metadata:
+  name: test-cluster-internal-$NAMESPACE
+spec:
+  serviceType: ClusterIP
+---
+apiVersion: listeners.stackable.tech/v1alpha1
+kind: ListenerClass
+metadata:
+  name: test-external-stable-$NAMESPACE
+spec:
+  serviceType: NodePort
+---
+apiVersion: listeners.stackable.tech/v1alpha1
+kind: ListenerClass
+metadata:
+  name: test-external-unstable-$NAMESPACE
+spec:
+  serviceType: NodePort