Skip to content

Commit 70f26ae

Browse files
committed
fix: remove duplicated STACKABLE_LOG_DIR constant
1 parent a1c29e8 commit 70f26ae

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ use stackable_operator::{
2424
product_logging,
2525
v2::{
2626
builder::pod::container::{EnvVarSet, new_container_builder},
27-
product_logging::framework::{ValidatedContainerLogConfigChoice, vector_container},
27+
product_logging::framework::{
28+
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container,
29+
},
2830
role_group_utils::ResourceNames,
2931
types::{
3032
kubernetes::{ContainerName, VolumeName},
@@ -49,7 +51,7 @@ use crate::{
4951
crd::{
5052
Container, DRUID_CONFIG_DIRECTORY, DeepStorageSpec, DruidRole, HDFS_CONFIG_DIRECTORY,
5153
LOG_CONFIG_DIRECTORY, METRICS_PORT, METRICS_PORT_NAME, RW_CONFIG_DIRECTORY,
52-
STACKABLE_LOG_DIR, ValidatedDruidConfig,
54+
ValidatedDruidConfig,
5355
},
5456
};
5557

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ use stackable_operator::{
4040
builder::pod::container::{EnvVarName, EnvVarSet},
4141
config_overrides::KeyValueConfigOverrides,
4242
product_logging::framework::{
43-
ValidatedContainerLogConfigChoice, VectorContainerLogConfig,
43+
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, VectorContainerLogConfig,
4444
validate_logging_configuration_for_container,
4545
},
4646
role_utils::{JavaCommonConfig, RoleGroupConfig, with_validated_config},
@@ -84,7 +84,6 @@ pub const RW_CONFIG_DIRECTORY: &str = "/stackable/rwconfig";
8484
pub const STACKABLE_TRUST_STORE: &str = "/stackable/truststore.p12";
8585
pub const STACKABLE_TRUST_STORE_PASSWORD: &str = "changeit";
8686
pub const STACKABLE_TRUST_STORE_TYPE: &str = "pkcs12";
87-
pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
8887

8988
pub const PROP_SEGMENT_CACHE_LOCATIONS: &str = "druid.segmentCache.locations";
9089

0 commit comments

Comments
 (0)