Rename listener scope to listener-volume

Author: nightkr

rust/operator-binary/src/backend/k8s_search.rs

@@ -160,7 +160,7 @@ fn build_label_selector_query(
             SecretScope::Service { name } => {
                 label_selector.insert(LABEL_SCOPE_SERVICE.to_string(), name.clone());
             }
-            SecretScope::Listener { name } => {
+            SecretScope::ListenerVolume { name } => {
                 label_selector.insert(
                     format!("{LABEL_SCOPE_LISTENER}.{listener_i}"),
                     scheduling_pod_info

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

@@ -117,7 +117,7 @@ impl SecretVolumeSelector {
                 "{}.{}.svc.cluster.local",
                 name, self.namespace
             ))],
-            scope::SecretScope::Listener { name } => pod_info
+            scope::SecretScope::ListenerVolume { name } => pod_info
                 .listener_addresses
                 .get(name)
                 .context(NoListenerAddressesSnafu { listener: name })?

rust/operator-binary/src/backend/pod_info.rs

@@ -213,7 +213,7 @@ impl SchedulingPodInfo {
         let volume_listener_pvcs = futures::stream::iter(scopes)
             .filter_map(|scope| async move {
                 match scope {
-                    SecretScope::Listener { name } => Some(name),
+                    SecretScope::ListenerVolume { name } => Some(name),
                     _ => None,
                 }
             })
@@ -339,7 +339,7 @@ async fn pod_listener_addresses(
     scopes
         .iter()
         .filter_map(|scope| match scope {
-            SecretScope::Listener { name } => Some(name),
+            SecretScope::ListenerVolume { name } => Some(name),
             _ => None,
         })
         .map(|listener| {

rust/operator-binary/src/backend/scope.rs

@@ -11,7 +11,7 @@ pub enum SecretScope {
     Node,
     Pod,
     Service { name: String },
-    Listener { name: String },
+    ListenerVolume { name: String },
 }
 impl From<&SecretScope> for SecretScope {
     fn from(value: &SecretScope) -> Self {
@@ -43,7 +43,7 @@ impl SecretScope {
                     .context(deserialize_error::ScopeRequiresParamSnafu { tpe })?
                     .to_string(),
             },
-            "listener" => Self::Listener {
+            "listener-volume" => Self::ListenerVolume {
                 name: param
                     .take()
                     .context(deserialize_error::ScopeRequiresParamSnafu { tpe })?
@@ -71,7 +71,7 @@ impl Display for SecretScope {
             SecretScope::Node => write!(f, "node"),
             SecretScope::Pod => write!(f, "pod"),
             SecretScope::Service { name } => write!(f, "service={name}"),
-            SecretScope::Listener { name } => write!(f, "listener={name}"),
+            SecretScope::ListenerVolume { name } => write!(f, "listener-volume={name}"),
         }
     }
 }

tests/templates/kuttl/listener/01-install-nginx.yaml

@@ -34,7 +34,7 @@ spec:
             metadata:
               annotations:
                 secrets.stackable.tech/class: tls
-                secrets.stackable.tech/scope: listener=listener
+                secrets.stackable.tech/scope: listener-volume=listener
             spec:
               storageClassName: secrets.stackable.tech
               accessModes: