Skip to content
Draft
Show file tree
Hide file tree
Changes from all 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
25 changes: 13 additions & 12 deletions Cargo.lock

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

64 changes: 34 additions & 30 deletions Cargo.nix

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository = "https://github.com/stackabletech/nifi-operator"

[workspace.dependencies]
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.8.0" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.0", features = ["webhook"] }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.111.1", features = ["webhook"] }

anyhow = "1.0"
built = { version = "0.8", features = ["chrono", "git2"] }
Expand All @@ -34,6 +34,6 @@ tracing = "0.1"
url = { version = "2.5.7" }
xml-rs = "1.0"

# [patch."https://github.com/stackabletech/operator-rs.git"]
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
[patch."https://github.com/stackabletech/operator-rs.git"]
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/annotation-auto-tls-cert-subject-dn" }
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
18 changes: 9 additions & 9 deletions crate-hashes.json

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

4 changes: 3 additions & 1 deletion rust/operator-binary/src/controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ pub async fn reconcile_nifi(
&merged_config,
&proxy_hosts,
&git_sync_resources,
&client.kubernetes_cluster_info,
)
.await?;

Expand Down Expand Up @@ -700,14 +701,15 @@ async fn build_node_rolegroup_config_map(
merged_config: &NifiConfig,
proxy_hosts: &str,
git_sync_resources: &git_sync::v1alpha2::GitSyncResources,
cluster_info: &KubernetesClusterInfo,
) -> Result<ConfigMap> {
tracing::debug!("building rolegroup configmaps");

let login_identity_provider_xml = authentication_config
.get_authentication_config()
.context(InvalidNifiAuthenticationConfigSnafu)?;

let authorizers_xml = authorization_config.get_authorizers_config(nifi);
let authorizers_xml = authorization_config.get_authorizers_config(nifi, cluster_info);

let jvm_sec_props: BTreeMap<String, Option<String>> = rolegroup_config
.get(&PropertyNameKind::File(
Expand Down
Loading
Loading