Skip to content

Commit ff4adee

Browse files
committed
fix: use upstream STACKABLE_LOG_DIR
1 parent 4b65949 commit ff4adee

5 files changed

Lines changed: 18 additions & 9 deletions

File tree

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ use stackable_operator::{
99
k8s_openapi::api::core::v1::EnvVar,
1010
kube::ResourceExt,
1111
product_logging::framework::create_vector_shutdown_file_command,
12-
v2::builder::pod::container::EnvVarSet,
12+
v2::{
13+
builder::pod::container::EnvVarSet,
14+
product_logging::framework::STACKABLE_LOG_DIR,
15+
},
1316
};
1417

1518
use crate::{
1619
controller::{ValidatedCluster, ValidatedLogging},
1720
crd::{
18-
AirflowExecutor, AirflowRole, HTTP_PORT, LOG_CONFIG_DIR, STACKABLE_LOG_DIR,
19-
TEMPLATE_LOCATION, TEMPLATE_NAME,
21+
AirflowExecutor, AirflowRole, HTTP_PORT, LOG_CONFIG_DIR, TEMPLATE_LOCATION, TEMPLATE_NAME,
2022
authentication::{
2123
AirflowAuthenticationClassResolved, AirflowClientAuthenticationDetailsResolved,
2224
},

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ use stackable_operator::{
88
builder::configmap::ConfigMapBuilder,
99
k8s_openapi::api::core::v1::ConfigMap,
1010
product_logging::framework::VECTOR_CONFIG_FILE,
11-
v2::types::operator::{RoleGroupName, RoleName},
11+
v2::{
12+
product_logging::framework::STACKABLE_LOG_DIR,
13+
types::operator::{RoleGroupName, RoleName},
14+
},
1215
};
1316

1417
use crate::{
@@ -19,7 +22,7 @@ use crate::{
1922
webserver_config,
2023
},
2124
},
22-
crd::{AIRFLOW_CONFIG_FILENAME, AirflowConfigOverrides, Container, STACKABLE_LOG_DIR},
25+
crd::{AIRFLOW_CONFIG_FILENAME, AirflowConfigOverrides, Container},
2326
};
2427

2528
#[derive(Snafu, Debug)]

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ use stackable_operator::{
1616
api::core::v1::{ConfigMap, PodTemplateSpec},
1717
},
1818
kvp::{Label, LabelError},
19-
v2::builder::pod::container::new_container_builder,
19+
v2::{
20+
builder::pod::container::new_container_builder,
21+
product_logging::framework::STACKABLE_LOG_DIR,
22+
},
2023
};
2124

2225
use crate::{
@@ -35,7 +38,7 @@ use crate::{
3538
volumes::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
3639
},
3740
},
38-
crd::{CONFIG_PATH, Container, LOG_CONFIG_DIR, STACKABLE_LOG_DIR, TEMPLATE_NAME},
41+
crd::{CONFIG_PATH, Container, LOG_CONFIG_DIR, TEMPLATE_NAME},
3942
};
4043

4144
#[derive(Snafu, Debug)]

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use stackable_operator::{
2424
container::new_container_builder,
2525
volume::{ListenerReference, listener_operator_volume_source_builder_build_pvc},
2626
},
27+
product_logging::framework::STACKABLE_LOG_DIR,
2728
types::operator::RoleGroupName,
2829
},
2930
};
@@ -47,7 +48,7 @@ use crate::{
4748
crd::{
4849
AirflowExecutor, AirflowRole, CONFIG_PATH, Container, HTTP_PORT_NAME, LISTENER_PVC_NAME,
4950
LISTENER_VOLUME_DIR, LOG_CONFIG_DIR, METRICS_CONTAINER_NAME, METRICS_PORT,
50-
METRICS_PORT_NAME, STACKABLE_LOG_DIR, TEMPLATE_LOCATION, TEMPLATE_VOLUME_NAME,
51+
METRICS_PORT_NAME, TEMPLATE_LOCATION, TEMPLATE_VOLUME_NAME,
5152
},
5253
};
5354

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ use stackable_operator::{
3939
v2::{
4040
config_overrides::KeyValueConfigOverrides,
4141
flask_config_writer::{FlaskAppConfigOptions, PythonType},
42+
product_logging::framework::STACKABLE_LOG_DIR,
4243
role_utils::GenericCommonConfig,
4344
types::{
4445
common::Port,
@@ -77,7 +78,6 @@ pub const APP_NAME: &str = "airflow";
7778
pub const FIELD_MANAGER: &str = "airflow-operator";
7879
pub const OPERATOR_NAME: &str = "airflow.stackable.tech";
7980
pub const CONFIG_PATH: &str = "/stackable/app/config";
80-
pub const STACKABLE_LOG_DIR: &str = "/stackable/log";
8181
pub const LOG_CONFIG_DIR: &str = "/stackable/app/log_config";
8282
pub const AIRFLOW_HOME: &str = "/stackable/airflow";
8383
pub const AIRFLOW_CONFIG_FILENAME: &str = "webserver_config.py";

0 commit comments

Comments
 (0)