Merge branch 'main' into feat/smooth-operator/introduce-builder

Author: siegfriedweber

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [26.7.0] - 2026-07-21
+
+## [26.7.0-rc1] - 2026-07-16
+
 ### Added
 
 - BREAKING: Add required CLI argument and env var to set the image repository used to construct final product image names: `IMAGE_REPOSITORY` (`--image-repository`), eg. `oci.example.org/my/namespace` ([#928]).

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

Cargo.toml

@@ -97,16 +97,16 @@ pub fn build_merged_jvm_config(
     // respects these JVM-wide SSL system properties. So there is no plugin-level configuration
     // available for truststore settings. This was last checked for version 1.7.0 of the Styra
     // OPA Java SDK.
-    if let Some(authz_config) = authorization_config {
-        if authz_config.has_opa_tls() {
-            operator_generated.push(format!(
-                "-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
-            ));
-            operator_generated.push(format!(
-                "-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
-            ));
-            operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
-        }
+    if let Some(authz_config) = authorization_config
+        && authz_config.has_opa_tls()
+    {
+        operator_generated.push(format!(
+            "-Djavax.net.ssl.trustStore={STACKABLE_SERVER_TLS_DIR}/truststore.p12"
+        ));
+        operator_generated.push(format!(
+            "-Djavax.net.ssl.trustStorePassword={STACKABLE_TLS_STORE_PASSWORD}"
+        ));
+        operator_generated.push("-Djavax.net.ssl.trustStoreType=pkcs12".to_owned());
     }
 
     Ok(merged_jvm_argument_overrides.apply_to(operator_generated))

rust/operator-binary/src/controller/build/jvm.rs

@@ -40,7 +40,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

@@ -39,6 +39,8 @@ do
 done
 
 # Ensure this script is executable
-chmod +x docs/modules/opensearch/examples/getting_started/getting_started.sh
+chmod +x "docs/modules/nifi/examples/getting_started/getting_started.sh" \
+  || chmod +x "docs/modules/nifi/examples/getting_started/code/getting_started.sh" \
+  || true
 
 echo "done"