update op-rs

stackabletech · Jan 2, 2025 · 6f125a3 · 6f125a3
1 parent 4f98093
commit 6f125a3
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deploy/helm/nifi-operator/crds/crds.yaml b/deploy/helm/nifi-operator/crds/crds.yaml
@@ -660,7 +660,7 @@ spec:
                         add: []
                         remove: []
                         removeRegex: []
-                      description: Allows overriding JVM arguments.
+                      description: Allows overriding JVM arguments. Please read on the [JVM argument overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#jvm-argument-overrides) for details on the usage.
                       properties:
                         add:
                           default: []
@@ -1144,7 +1144,7 @@ spec:
                               add: []
                               remove: []
                               removeRegex: []
-                            description: Allows overriding JVM arguments.
+                            description: Allows overriding JVM arguments. Please read on the [JVM argument overrides documentation](https://docs.stackable.tech/home/nightly/concepts/overrides#jvm-argument-overrides) for details on the usage.
                             properties:
                               add:
                                 default: []

diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -867,7 +867,7 @@ mod tests {
         let merged_config = nifi.merged_config(&role, "default").unwrap();
         let nodes = nifi.spec.nodes.unwrap();
         let (role_java_common_config, role_group_java_common_config) = nodes
-            .merged_product_specific_common_configs("default")
+            .get_product_specific_common_configs("default")
             .unwrap();
 
         build_bootstrap_conf(

diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -559,7 +559,7 @@ pub async fn reconcile_nifi(
             let proxy_hosts = get_proxy_hosts(client, nifi, &updated_role_service).await?;
 
             let (role_java_common_config, role_group_java_common_config) = role
-                .merged_product_specific_common_configs(rolegroup_name)
+                .get_product_specific_common_configs(rolegroup_name)
                 .context(GetMergedJvmArgumentOverridesSnafu)?;
             let rg_configmap = build_node_rolegroup_config_map(
                 nifi,