Skip to content

refactor: Don't modify ContainerBuilder after it has been build #838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xeniape merged 5 commits into from
Aug 28, 2025
Merged

refactor: Don't modify ContainerBuilder after it has been build #838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2ebb6e
fix: propagate auth volumeMounts to nifi container
xeniape Aug 26, 2025
1e64189
remove nifi container from auth config mount
xeniape Aug 27, 2025
8e50306
move code to previous place
xeniape Aug 27, 2025
6edbf7f
bump url crate version
xeniape Aug 28, 2025
09121e5
Update rust/operator-binary/src/controller.rs
xeniape Aug 28, 2025
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions Cargo.nix
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ snafu = "0.8"
strum = { version = "0.27", features = ["derive"] }
tokio = { version = "1.40", features = ["full"] }
tracing = "0.1"
url = { version = "2.5.2" }
url = { version = "2.5.7" }
xml-rs = "0.8"

# [patch."https://github.com/stackabletech/operator-rs.git"]
Expand Down
20 changes: 10 additions & 10 deletions rust/operator-binary/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,11 +1064,12 @@ async fn build_node_rolegroup_statefulset(
);

let nifi_container_name = Container::Nifi.to_string();
let mut container_builder = ContainerBuilder::new(&nifi_container_name).with_context(|_| {
IllegalContainerNameSnafu {
container_name: nifi_container_name,
}
})?;
let mut container_nifi_builder =
ContainerBuilder::new(&nifi_container_name).with_context(|_| {
IllegalContainerNameSnafu {
container_name: nifi_container_name,
}
})?;

let nifi_args = vec![formatdoc! {"
{COMMON_BASH_TRAP_FUNCTIONS}
Expand All @@ -1084,7 +1085,7 @@ async fn build_node_rolegroup_statefulset(
create_vector_shutdown_file_command =
create_vector_shutdown_file_command(STACKABLE_LOG_DIR),
}];
let container_nifi = container_builder
let container_nifi = container_nifi_builder
.image_from_product_image(resolved_product_image)
.command(vec![
"/bin/bash".to_string(),
Expand Down Expand Up @@ -1226,6 +1227,8 @@ async fn build_node_rolegroup_statefulset(

// We want to add nifi container first for easier defaulting into this container
pod_builder.add_container(container_nifi.build());
// After calling `build()` the ContainerBuilder shouldn't be used anymore, so we drop it
drop(container_nifi_builder);

for container in git_sync_resources.git_sync_containers.iter().cloned() {
pod_builder.add_container(container);
Expand Down Expand Up @@ -1294,10 +1297,7 @@ async fn build_node_rolegroup_statefulset(
}

authentication_config
.add_volumes_and_mounts(
&mut pod_builder,
vec![&mut container_prepare, container_nifi],
)
.add_volumes_and_mounts(&mut pod_builder, vec![&mut container_prepare])
.context(AddAuthVolumesSnafu)?;

let metadata = ObjectMetaBuilder::new()
Expand Down
Loading