Skip to content

Commit 7e80e9a

Browse files
committed
removing add_env for dags-init container
1 parent 61dc8ce commit 7e80e9a

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

rust/operator-binary/src/airflow_controller.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,12 +1328,6 @@ fn build_executor_template_config_map(
13281328
dags_init_container
13291329
.image_from_product_image(resolved_product_image)
13301330
.args(airflow.get_kubernetes_executer_multi_gitsync_commands())
1331-
.add_env_vars(build_airflow_template_envs(
1332-
airflow,
1333-
env_overrides,
1334-
merged_executor_config,
1335-
resolved_product_image,
1336-
))
13371331
.command(vec![
13381332
"/bin/bash".to_string(),
13391333
"-x".to_string(),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ impl v1alpha2::AirflowCluster {
440440
fragment::validate(conf_rolegroup).context(FragmentValidationFailureSnafu)
441441
}
442442

443-
// Softlink from each single folder git-{i} into {AIRFLOW_DAGS_FOLDER}/
443+
// Softlink from each single folder git-{i} into {AIRFLOW_DAGS_FOLDER}/.
444444
pub fn get_multi_gitsync_commands(&self) -> Vec<String> {
445445
let mut symlinks = Vec::<String>::new();
446446
for (i, _) in self.spec.cluster_config.dags_git_sync.iter().enumerate() {
@@ -452,7 +452,7 @@ impl v1alpha2::AirflowCluster {
452452
symlinks
453453
}
454454

455-
// kubernetesExecuter needs copy since it needs init-container
455+
// kubernetesExecuter needs copy since it needs init-container.
456456
pub fn get_kubernetes_executer_multi_gitsync_commands(&self) -> Vec<String> {
457457
let mut cp_commands = Vec::<String>::new();
458458
for (i, _) in self.spec.cluster_config.dags_git_sync.iter().enumerate() {
@@ -465,7 +465,7 @@ impl v1alpha2::AirflowCluster {
465465
vec![cp_commands.join(" && ")]
466466
}
467467

468-
// PYTHONPATH contains folder-name provided in CRD
468+
// PYTHONPATH contains folder-name provided in CRD.
469469
pub fn get_gitsync_absolute_paths(&self) -> Vec<String> {
470470
let mut python_path = Vec::<String>::new();
471471
for (i, git_sync) in self.spec.cluster_config.dags_git_sync.iter().enumerate() {
@@ -636,7 +636,7 @@ impl AirflowRole {
636636
format!(
637637
"cp -RL {CONFIG_PATH}/{AIRFLOW_CONFIG_FILENAME} {AIRFLOW_HOME}/{AIRFLOW_CONFIG_FILENAME}"
638638
),
639-
// Adding cm as dags within the same AIRFLOW_DAGS_FOLDER leads to problems, thus checking if exists
639+
// Adding cm as dags within the same AIRFLOW_DAGS_FOLDER may lead to problems, thus checking if exists.
640640
format!("mkdir -p {AIRFLOW_DAGS_FOLDER}"),
641641
// graceful shutdown part
642642
COMMON_BASH_TRAP_FUNCTIONS.to_string(),

0 commit comments

Comments
 (0)