use ephemeral listeners classes; fix test missing dimension

Author: adwk67

rust/operator-binary/src/airflow_controller.rs

@@ -23,10 +23,7 @@ use stackable_operator::{
             container::ContainerBuilder,
             resources::ResourceRequirementsBuilder,
             security::PodSecurityContextBuilder,
-            volume::{
-                ListenerOperatorVolumeSourceBuilder, ListenerOperatorVolumeSourceBuilderError,
-                ListenerReference, VolumeBuilder,
-            },
+            volume::{ListenerOperatorVolumeSourceBuilderError, VolumeBuilder},
         },
     },
     cluster_resources::{ClusterResourceApplyStrategy, ClusterResources},
@@ -980,26 +977,14 @@ fn build_server_rolegroup_statefulset(
     }
 
     let listener_class = &merged_airflow_config.listener_class;
-    // externally-reachable listener endpoints should use a pvc volume...
-    let pvcs = if listener_class.discoverable() {
-        let pvc = ListenerOperatorVolumeSourceBuilder::new(
-            &ListenerReference::ListenerClass(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
-        pb.add_listener_volume_by_listener_class(
-            LISTENER_VOLUME_NAME,
-            &listener_class.to_string(),
-            &recommended_labels,
-        )
-        .context(AddVolumeSnafu)?;
-        None
-    };
+    // all listeners will use ephemeral volumes as they can/should
+    // be removed when the pods is re-started, and no data needs to be preserved
+    pb.add_listener_volume_by_listener_class(
+        LISTENER_VOLUME_NAME,
+        &listener_class.to_string(),
+        &recommended_labels,
+    )
+    .context(AddVolumeSnafu)?;
 
     airflow_container
         .add_volume_mount(LISTENER_VOLUME_NAME, LISTENER_VOLUME_DIR)
@@ -1157,7 +1142,6 @@ fn build_server_rolegroup_statefulset(
         },
         service_name: rolegroup_ref.object_name(),
         template: pod_template,
-        volume_claim_templates: pvcs,
         ..StatefulSetSpec::default()
     };
 

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

@@ -43,7 +43,7 @@ use stackable_operator::{
     versioned::versioned,
 };
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
-use utils::{PodRef, get_persisted_listener_podrefs};
+use utils::{PodRef, get_listener_podrefs};
 
 use crate::crd::{
     affinity::{get_affinity, get_executor_affinity},
@@ -555,7 +555,7 @@ impl v1alpha1::AirflowCluster {
         if let Ok(Some(listener_class)) = self.merged_listener_class(role, rolegroup_name) {
             listener_class.discoverable()
         } else {
-            // merged_listener_class returns an error is one of the roles was not found:
+            // merged_listener_class returns an error if one of the roles was not found:
             // all roles are mandatory for airflow to work, but a missing role will by
             // definition not have a listener class
             false
@@ -592,7 +592,7 @@ impl v1alpha1::AirflowCluster {
         let pod_refs = self.pod_refs(role)?;
 
         tracing::debug!("Pod references for role {role}: {:#?}", pod_refs);
-        get_persisted_listener_podrefs(client, pod_refs, LISTENER_VOLUME_NAME)
+        get_listener_podrefs(client, pod_refs, LISTENER_VOLUME_NAME)
             .await
             .context(ListenerPodRefSnafu)
     }

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

@@ -59,15 +59,15 @@ impl PodRef {
     }
 }
 
-pub async fn get_persisted_listener_podrefs(
+pub async fn get_listener_podrefs(
     client: &stackable_operator::client::Client,
     pod_refs: Vec<PodRef>,
     listener_prefix: &str,
 ) -> Result<Vec<PodRef>, Error> {
     try_join_all(pod_refs.into_iter().map(|pod_ref| async {
-        // N.B. use the naming convention for persistent listener volumes as we
-        // only want externally-reachable endpoints.
-        let listener_name = format!("{listener_prefix}-{}", pod_ref.pod_name);
+        // N.B. use the naming convention for ephemeral listener volumes as we
+        // have defined all listeners to be so.
+        let listener_name = format!("{}-{listener_prefix}", pod_ref.pod_name);
         let listener_ref = || ObjectRef::<Listener>::new(&listener_name).within(&pod_ref.namespace);
         let pod_obj_ref = || ObjectRef::<Pod>::new(&pod_ref.pod_name).within(&pod_ref.namespace);
         let listener = client

…/kuttl/external-access/20-assert.yaml.j2 …tes/kuttl/external-access/20-assert.yamltests/templates/kuttl/external-access/20-assert.yaml.j2 renamed to tests/templates/kuttl/external-access/20-assert.yaml tests/templates/kuttl/external-access/20-assert.yaml.j2 renamed to tests/templates/kuttl/external-access/20-assert.yaml

@@ -1,4 +1,3 @@
-{% if test_scenario['values']['executor'] == 'celery' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
@@ -21,4 +20,3 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% endif %}

…external-access/20-install-redis.yaml.j2 …tl/external-access/20-install-redis.yamltests/templates/kuttl/external-access/20-install-redis.yaml.j2 renamed to tests/templates/kuttl/external-access/20-install-redis.yaml tests/templates/kuttl/external-access/20-install-redis.yaml.j2 renamed to tests/templates/kuttl/external-access/20-install-redis.yaml

@@ -1,4 +1,3 @@
-{% if test_scenario['values']['executor'] == 'celery' %}
 ---
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
@@ -11,4 +10,3 @@ commands:
       --repo https://charts.bitnami.com/bitnami redis
       --wait
     timeout: 600
-{% endif %}

…/kuttl/external-access/40-assert.yaml.j2 …tes/kuttl/external-access/40-assert.yamltests/templates/kuttl/external-access/40-assert.yaml.j2 renamed to tests/templates/kuttl/external-access/40-assert.yaml tests/templates/kuttl/external-access/40-assert.yaml.j2 renamed to tests/templates/kuttl/external-access/40-assert.yaml

@@ -40,7 +40,6 @@ metadata:
 status:
   readyReplicas: 1
   replicas: 1
-{% if test_scenario['values']['executor'] == 'celery' %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -53,7 +52,6 @@ spec:
 status:
   readyReplicas: 2
   replicas: 2
-{% endif %}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -75,7 +73,6 @@ status:
   expectedPods: 3
   currentHealthy: 3
   disruptionsAllowed: 1
-{% if test_scenario['values']['executor'] == 'celery' %}
 ---
 apiVersion: policy/v1
 kind: PodDisruptionBudget
@@ -85,7 +82,6 @@ status:
   expectedPods: 2
   currentHealthy: 2
   disruptionsAllowed: 1
-{% endif %}
 ---
 apiVersion: policy/v1
 kind: PodDisruptionBudget