Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ 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]
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.113.4", features = ["webhook"] }

anyhow = "1.0"
built = { version = "0.8", features = ["chrono", "git2"] }
built = { version = "0.8.1", features = ["chrono", "git2"] }
Comment thread
Saul-STFC marked this conversation as resolved.
Outdated
clap = "4.6"
const_format = "0.2"
fnv = "1.0"
Expand Down
20 changes: 10 additions & 10 deletions rust/operator-binary/src/controller/build/jvm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion rust/operator-binary/src/webhooks/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading