Merge branch 'main' into feat/trino-481

Author: sbernauer

Cargo.nix

@@ -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/trino-operator"
 
 [workspace.dependencies]

Cargo.toml

@@ -526,26 +526,26 @@ pub async fn reconcile_trino(
             );
         }
 
-        if let Some(listener_class) = trino_role.listener_class_name(trino) {
-            if let Some(listener_group_name) = group_listener_name(trino, &trino_role) {
-                let role_group_listener = build_group_listener(
+        if let Some(listener_class) = trino_role.listener_class_name(trino)
+            && let Some(listener_group_name) = group_listener_name(trino, &trino_role)
+        {
+            let role_group_listener = build_group_listener(
+                trino,
+                build_recommended_labels(
                     trino,
-                    build_recommended_labels(
-                        trino,
-                        &validated.image.app_version_label_value,
-                        &trino_role_str,
-                        "none",
-                    ),
-                    listener_class.to_string(),
-                    listener_group_name,
-                )
-                .context(ListenerConfigurationSnafu)?;
+                    &validated.image.app_version_label_value,
+                    &trino_role_str,
+                    "none",
+                ),
+                listener_class.to_string(),
+                listener_group_name,
+            )
+            .context(ListenerConfigurationSnafu)?;
 
-                cluster_resources
-                    .add(client, role_group_listener)
-                    .await
-                    .context(ApplyGroupListenerSnafu)?;
-            }
+            cluster_resources
+                .add(client, role_group_listener)
+                .await
+                .context(ApplyGroupListenerSnafu)?;
         }
 
         let role_config = trino.generic_role_config(&trino_role);

rust/operator-binary/src/controller.rs

@@ -46,7 +46,7 @@ pub async fn create_webhook_server(
         field_manager: FIELD_MANAGER.to_owned(),
     };
 
-    let (conversion_webhook, _initial_reconcile_rx) =
+    let (conversion_webhook, _) =
         ConversionWebhook::new(crds_and_handlers, client, conversion_webhook_options);
 
     let webhook_server_options = WebhookServerOptions {

rust/operator-binary/src/webhooks/conversion.rs

@@ -48,6 +48,7 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.4
+      - 3.9.5
   - name: keycloak
     values:
       - 25.0.0