Merge remote-tracking branch 'origin/main' into refactor/remove-product-config

Author: maltesander

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

Cargo.toml

@@ -46,20 +46,20 @@ pub fn build_container_command_args(
         ]);
     }
 
-    if let Some(s3) = s3_connection_spec {
-        if let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path() {
-            args.push(format!(
+    if let Some(s3) = s3_connection_spec
+        && let Some(ca_cert_file) = s3.tls.tls_ca_cert_mount_path()
+    {
+        args.push(format!(
                 "cert-tools generate-pkcs12-truststore --pkcs12 {STACKABLE_TRUST_STORE}:{STACKABLE_TRUST_STORE_PASSWORD} --pem {ca_cert_file} --out {STACKABLE_TRUST_STORE} --out-password {STACKABLE_TRUST_STORE_PASSWORD}"
             ));
-        }
     }
 
-    if let Some(opa) = hive_opa_config {
-        if let Some(ca_cert_dir) = opa.tls_ca_cert_mount_path() {
-            args.push(format!(
+    if let Some(opa) = hive_opa_config
+        && let Some(ca_cert_dir) = opa.tls_ca_cert_mount_path()
+    {
+        args.push(format!(
                 "cert-tools generate-pkcs12-truststore --pkcs12 {STACKABLE_TRUST_STORE}:{STACKABLE_TRUST_STORE_PASSWORD} --pem {ca_cert_dir}/ca.crt --out {STACKABLE_TRUST_STORE} --out-password {STACKABLE_TRUST_STORE_PASSWORD}"
             ));
-        }
     }
 
     // metastore start command

rust/operator-binary/src/command.rs

@@ -777,12 +777,12 @@ fn build_metastore_rolegroup_statefulset(
 
     // TODO: refactor this when CRD versioning is in place
     // Warn if the capacity field has been set to anything other than 0Mi
-    if let Some(Quantity(capacity)) = merged_config.resources.storage.data.capacity.as_ref() {
-        if capacity != &"0Mi".to_string() {
-            tracing::warn!(
-                "The 'storage' CRD property is set to [{capacity}]. This field is not used and will be removed in a future release."
-            );
-        }
+    if let Some(Quantity(capacity)) = merged_config.resources.storage.data.capacity.as_ref()
+        && capacity != &"0Mi".to_string()
+    {
+        tracing::warn!(
+            "The 'storage' CRD property is set to [{capacity}]. This field is not used and will be removed in a future release."
+        );
     }
 
     let recommended_object_labels = build_recommended_labels(

rust/operator-binary/src/controller.rs

@@ -37,7 +37,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 {