Skip to content

Commit 976e914

Browse files
committed
refactor: move k8s resources to build/resource
1 parent aa21bd7 commit 976e914

15 files changed

Lines changed: 809 additions & 737 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ use crate::{crd::storage::NifiRepository, security::oidc};
88

99
pub mod config_map;
1010
pub mod git_sync;
11+
pub mod graceful_shutdown;
1112
pub mod jvm;
1213
pub mod properties;
1314
pub mod proxy_hosts;
15+
pub mod resource;
1416

1517
/// Errors that can occur while building the NiFi product configuration files.
1618
#[derive(Snafu, Debug)]

rust/operator-binary/src/operations/graceful_shutdown.rs renamed to rust/operator-binary/src/controller/build/graceful_shutdown.rs

File renamed without changes.

rust/operator-binary/src/controller/build/properties/bootstrap_conf.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ use snafu::ResultExt;
77
use crate::{
88
controller::{
99
ValidatedRoleGroupConfig,
10-
build::{Error, InvalidJVMConfigSnafu, jvm::build_merged_jvm_config},
10+
build::{
11+
Error, InvalidJVMConfigSnafu, graceful_shutdown::graceful_shutdown_config_properties,
12+
jvm::build_merged_jvm_config,
13+
},
1114
},
12-
operations::graceful_shutdown::graceful_shutdown_config_properties,
1315
security::authorization::ResolvedNifiAuthorizationConfig,
1416
};
1517

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ use std::collections::HashSet;
44

55
use stackable_operator::utils::cluster_info::KubernetesClusterInfo;
66

7-
use crate::{controller::ValidatedCluster, crd::HTTPS_PORT, reporting_task};
7+
use crate::{
8+
controller::{ValidatedCluster, build::resource::reporting_task},
9+
crd::HTTPS_PORT,
10+
};
811

912
/// Computes the comma-separated NiFi proxy hosts, or `"*"` if `hostHeaderCheck.allowAll` is set.
1013
///

rust/operator-binary/src/listener.rs renamed to rust/operator-binary/src/controller/build/resource/listener.rs

File renamed without changes.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
//! Builders that assemble individual Kubernetes resources from a [`ValidatedCluster`].
2+
//!
3+
//! [`ValidatedCluster`]: crate::controller::ValidatedCluster
4+
5+
pub mod listener;
6+
pub mod pdb;
7+
pub mod reporting_task;
8+
pub mod service;
9+
pub mod statefulset;
File renamed without changes.

rust/operator-binary/src/reporting_task/mod.rs renamed to rust/operator-binary/src/controller/build/resource/reporting_task.rs

File renamed without changes.

rust/operator-binary/src/service.rs renamed to rust/operator-binary/src/controller/build/resource/service.rs

File renamed without changes.

0 commit comments

Comments
 (0)