Skip to content

Commit 1a4e708

Browse files
committed
refactor: move jvm config builder into controller/build
1 parent 96a6329 commit 1a4e708

6 files changed

Lines changed: 3 additions & 5 deletions

File tree

rust/operator-binary/src/config/mod.rs

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
pub mod config_map;
22
pub mod discovery;
3+
pub mod jvm;
34
pub mod properties;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use snafu::{ResultExt, Snafu};
66
use stackable_operator::v2::config_overrides::KeyValueConfigOverrides;
77

88
use crate::{
9-
config::jvm::{self, construct_global_jvm_args, construct_hbase_heapsize_env},
9+
controller::build::jvm::{self, construct_global_jvm_args, construct_hbase_heapsize_env},
1010
crd::{AnyServiceConfig, HbaseRole},
1111
};
1212

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ use stackable_operator::{
1919
use strum::IntoEnumIterator;
2020

2121
use crate::{
22-
config::jvm::construct_role_specific_non_heap_jvm_args,
2322
controller::{
2423
ValidatedCluster, ValidatedClusterConfig, ValidatedRoleConfig, ValidatedRoleGroupConfig,
25-
dereference::DereferencedObjects,
24+
build::jvm::construct_role_specific_non_heap_jvm_args, dereference::DereferencedObjects,
2625
},
2726
crd::{AnyServiceConfig, HbaseConfigFragment, HbaseRole, RegionServerConfigFragment, v1alpha1},
2827
kerberos::{

rust/operator-binary/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ use crate::{
3737
webhooks::conversion::create_webhook_server,
3838
};
3939

40-
mod config;
4140
mod controller;
4241
mod crd;
4342
mod hbase_controller;

0 commit comments

Comments
 (0)