Merge remote-tracking branch 'origin/main' into feat/smooth-operator/remove-product-config

maltesander · maltesander · commit b7906bab9cf8 · 2026-06-10T12:12:27.000+02:00
diff --git a/Cargo.nix b/Cargo.nix
diff --git 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/trino-operator"
 
 [workspace.dependencies]
diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -493,11 +493,10 @@ pub async fn reconcile_trino(
                 )
                 .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);
diff --git a/rust/operator-binary/src/webhooks/conversion.rs b/rust/operator-binary/src/webhooks/conversion.rs
@@ -48,7 +48,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 {
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -47,6 +47,7 @@ dimensions:
   - name: zookeeper
     values:
       - 3.9.4
+      - 3.9.5
   - name: keycloak
     values:
       - 25.0.0

Original file line number	Diff line number	Diff line change
`@@ -493,11 +493,10 @@ pub async fn reconcile_trino(`
`493`	`493`	`)`
`494`	`494`	`.context(ListenerConfigurationSnafu)?;`
`495`	`495`
`496`		`- cluster_resources`
`497`		`- .add(client, role_group_listener)`
`498`		`- .await`
`499`		`- .context(ApplyGroupListenerSnafu)?;`
`500`		`- }`
	`496`	`+ cluster_resources`
	`497`	`+ .add(client, role_group_listener)`
	`498`	`+ .await`
	`499`	`+ .context(ApplyGroupListenerSnafu)?;`
`501`	`500`	`}`
`502`	`501`
`503`	`502`	`let role_config = trino.generic_role_config(trino_role);`