Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Vector to version 0.33.0 in the tests #339

Merged
merged 2 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions rust/operator-binary/src/airflow_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1189,14 +1189,7 @@ fn build_template_envs(
airflow: &AirflowCluster,
env_overrides: &HashMap<String, String>,
) -> Vec<EnvVar> {
let secret_prop = Some(
airflow
.spec
.cluster_config
.credentials_secret
.as_str()
.clone(),
);
let secret_prop = Some(airflow.spec.cluster_config.credentials_secret.as_str());

let mut env = secret_prop
.map(|secret| {
Expand Down
13 changes: 7 additions & 6 deletions rust/operator-binary/src/product_logging.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::fmt::Display;
use std::fmt::{Display, Write};

use snafu::{OptionExt, ResultExt, Snafu};
use stackable_airflow_crd::STACKABLE_LOG_DIR;
Expand Down Expand Up @@ -122,16 +122,17 @@ fn create_airflow_config(log_config: &AutomaticContainerLogConfig, log_dir: &str
.loggers
.iter()
.filter(|(name, _)| name.as_str() != AutomaticContainerLogConfig::ROOT_LOGGER)
.map(|(name, config)| {
format!(
.fold(String::new(), |mut output, (name, config)| {
let _ = writeln!(
output,
"
LOGGING_CONFIG['loggers'].setdefault('{name}', {{ 'propagate': True }})
LOGGING_CONFIG['loggers']['{name}']['level'] = {level}
",
level = config.level.to_python_expression()
)
})
.collect::<String>();
);
output
});

format!(
"\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ commands:
- script: >-
helm install airflow-vector-aggregator vector
--namespace $NAMESPACE
--version 0.23.0
--version 0.26.0
--repo https://helm.vector.dev
--values airflow-vector-aggregator-values.yaml
---
Expand Down