Skip to content

Commit fb55644

Browse files
committed
fix: move to stackable-operator STACKABLE_LOG_DIR
1 parent b3a02e1 commit fb55644

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ use stackable_operator::{
44
create_vector_shutdown_file_command, remove_vector_shutdown_file_command,
55
},
66
utils::COMMON_BASH_TRAP_FUNCTIONS,
7+
v2::product_logging::framework::STACKABLE_LOG_DIR,
78
};
89

910
use super::properties::ConfigFileName;
1011
use crate::crd::{
1112
BROKER_ID_POD_MAP_DIR, KafkaPodDescriptor, STACKABLE_CONFIG_DIR, STACKABLE_KERBEROS_KRB5_PATH,
12-
STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR, security::KafkaTlsSecurity,
13+
STACKABLE_LOG_CONFIG_DIR, security::KafkaTlsSecurity,
1314
};
1415

1516
/// The JVM options selecting the Kafka log4j/log4j2 config file. Kafka 3.x uses log4j,

rust/operator-binary/src/controller/build/properties/product_logging/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@ use stackable_operator::{
99
self,
1010
spec::{ContainerLogConfig, ContainerLogConfigChoice},
1111
},
12+
v2::product_logging::framework::STACKABLE_LOG_DIR,
1213
};
1314

1415
use super::ConfigFileName;
15-
use crate::crd::{
16-
STACKABLE_LOG_DIR,
17-
role::{AnyConfig, broker::BrokerContainer, controller::ControllerContainer},
18-
};
16+
use crate::crd::role::{AnyConfig, broker::BrokerContainer, controller::ControllerContainer};
1917

2018
/// The maximum size of a single Kafka log file before it is rotated.
2119
pub const MAX_KAFKA_LOG_FILES_SIZE: MemoryQuantity = MemoryQuantity {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ use stackable_operator::{
3434
},
3535
},
3636
jvm_argument_overrides::JvmArgumentOverrides,
37-
product_logging::framework::{ValidatedContainerLogConfigChoice, vector_container},
37+
product_logging::framework::{
38+
STACKABLE_LOG_DIR, ValidatedContainerLogConfigChoice, vector_container,
39+
},
3840
role_group_utils::ResourceNames,
3941
types::kubernetes::{ContainerName, ListenerName, PersistentVolumeClaimName, VolumeName},
4042
},
@@ -59,7 +61,7 @@ use crate::{
5961
BROKER_ID_POD_MAP_DIR, KAFKA_HEAP_OPTS, LISTENER_BOOTSTRAP_VOLUME_NAME,
6062
LISTENER_BROKER_VOLUME_NAME, LOG_DIRS_VOLUME_NAME, METRICS_PORT, METRICS_PORT_NAME,
6163
STACKABLE_CONFIG_DIR, STACKABLE_DATA_DIR, STACKABLE_LISTENER_BOOTSTRAP_DIR,
62-
STACKABLE_LISTENER_BROKER_DIR, STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
64+
STACKABLE_LISTENER_BROKER_DIR, STACKABLE_LOG_CONFIG_DIR,
6365
role::{
6466
AnyConfig, KAFKA_NODE_ID_OFFSET, KafkaRole, broker::BrokerContainer,
6567
controller::ControllerContainer,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ pub const STACKABLE_CONFIG_DIR: &str = "/stackable/config";
6060
pub const STACKABLE_KERBEROS_DIR: &str = "/stackable/kerberos";
6161
pub const STACKABLE_KERBEROS_KRB5_PATH: &str = "/stackable/kerberos/krb5.conf";
6262
// logging
63-
pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
6463
pub const STACKABLE_LOG_CONFIG_DIR: &str = "/stackable/log_config";
6564
pub const BROKER_ID_POD_MAP_DIR: &str = "/stackable/broker-id-pod-map";
6665

0 commit comments

Comments
 (0)