From 3562c9c2cefacfec60151c24a46bf0114a90ac4b Mon Sep 17 00:00:00 2001
From: Saul Beck <saul.beck@stfc.ac.uk>
Date: Mon, 1 Jun 2026 10:43:52 +0100
Subject: [PATCH] feat: bump Rust edition to 2024

---
 Cargo.nix                                     |  2 +-
 Cargo.toml                                    |  2 +-
 .../operator-binary/src/airflow_controller.rs | 36 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.nix b/Cargo.nix
index 5ecf9a54..592ec8b2 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -9537,7 +9537,7 @@ rec {
       "stackable-airflow-operator" = rec {
         crateName = "stackable-airflow-operator";
         version = "0.0.0-dev";
-        edition = "2021";
+        edition = "2024";
         crateBin = [
           {
             name = "stackable-airflow-operator";
diff --git a/Cargo.toml b/Cargo.toml
index d04c1f1e..5081e284 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ resolver = "2"
 version = "0.0.0-dev"
 authors = ["Stackable GmbH <info@stackable.tech>"]
 license = "OSL-3.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/stackabletech/airflow-operator"
 
 [workspace.dependencies]
diff --git a/rust/operator-binary/src/airflow_controller.rs b/rust/operator-binary/src/airflow_controller.rs
index ea7dd9ad..6d7c4117 100644
--- a/rust/operator-binary/src/airflow_controller.rs
+++ b/rust/operator-binary/src/airflow_controller.rs
@@ -483,25 +483,25 @@ pub async fn reconcile_airflow(
                     .context(FailedToCreatePdbSnafu)?;
             }
 
-            if let Some(listener_class) = &role_config.listener_class {
-                if let Some(listener_group_name) = &role_config.group_listener_name {
-                    let rg_group_listener = build_group_listener(
+            if let Some(listener_class) = &role_config.listener_class
+                && let Some(listener_group_name) = &role_config.group_listener_name
+            {
+                let rg_group_listener = build_group_listener(
+                    airflow,
+                    build_recommended_labels(
                         airflow,
-                        build_recommended_labels(
-                            airflow,
-                            AIRFLOW_CONTROLLER_NAME,
-                            &validated.image.app_version_label_value,
-                            &role_name,
-                            "none",
-                        ),
-                        listener_class.to_string(),
-                        listener_group_name.clone(),
-                    )?;
-                    cluster_resources
-                        .add(client, rg_group_listener)
-                        .await
-                        .context(ApplyGroupListenerSnafu)?;
-                }
+                        AIRFLOW_CONTROLLER_NAME,
+                        &validated.image.app_version_label_value,
+                        &role_name,
+                        "none",
+                    ),
+                    listener_class.to_string(),
+                    listener_group_name.clone(),
+                )?;
+                cluster_resources
+                    .add(client, rg_group_listener)
+                    .await
+                    .context(ApplyGroupListenerSnafu)?;
             }
         }