Skip to content

Commit dedc010

Browse files
committed
fix: move graceful shutdown to build module
1 parent d936727 commit dedc010

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

rust/operator-binary/src/controller.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ use crate::{
8282
LISTENER_VOLUME_DIR, LISTENER_VOLUME_NAME, build_group_listener, build_group_listener_pvc,
8383
group_listener_name, secret_volume_listener_scope,
8484
},
85-
operations::{add_graceful_shutdown_config, pdb::add_pdbs},
85+
operations::pdb::add_pdbs,
8686
service::{build_rolegroup_headless_service, build_rolegroup_metrics_service},
8787
};
8888

@@ -204,7 +204,7 @@ pub enum Error {
204204

205205
#[snafu(display("failed to configure graceful shutdown"))]
206206
GracefulShutdown {
207-
source: crate::operations::graceful_shutdown::Error,
207+
source: build::graceful_shutdown::Error,
208208
},
209209

210210
#[snafu(display("failed to get required Labels"))]
@@ -639,7 +639,7 @@ fn build_rolegroup_statefulset(
639639
&mut cb_trino,
640640
)
641641
.context(InvalidAuthenticationConfigSnafu)?;
642-
add_graceful_shutdown_config(
642+
build::graceful_shutdown::add_graceful_shutdown_config(
643643
trino,
644644
trino_role,
645645
merged_config,
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
//! Builders that turn a `ValidatedCluster` into Kubernetes resource contents.
22
//!
33
//! `properties` renders the Trino `.properties` files; `config_map` assembles
4-
//! the per-rolegroup ConfigMap.
4+
//! the per-rolegroup ConfigMap; `graceful_shutdown` contributes graceful-shutdown
5+
//! `config.properties` entries and Pod lifecycle configuration.
56
67
pub mod config_map;
8+
pub mod graceful_shutdown;
79
pub mod properties;

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/config_properties.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,9 @@ pub fn build(
216216
}
217217

218218
// Graceful shutdown.
219-
for (k, v) in crate::operations::graceful_shutdown_config_properties(cluster, role) {
219+
for (k, v) in crate::controller::build::graceful_shutdown::graceful_shutdown_config_properties(
220+
cluster, role,
221+
) {
220222
props.insert(k, v);
221223
}
222224

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
pub mod graceful_shutdown;
21
pub mod pdb;
3-
4-
pub use graceful_shutdown::*;

0 commit comments

Comments
 (0)