airflow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kaxiln...@apache.org
Subject incubator-airflow git commit: [AIRFLOW-2655] Fix inconsistency of default config of kubernetes worker
Date Wed, 04 Jul 2018 16:48:57 GMT
Repository: incubator-airflow
Updated Branches:
  refs/heads/master e8e7209e3 -> 0523fbf00


[AIRFLOW-2655] Fix inconsistency of default config of kubernetes worker

Closes #3529 from mrkm4ntr/airflow-2655


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/0523fbf0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/0523fbf0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/0523fbf0

Branch: refs/heads/master
Commit: 0523fbf0047816c56acb50ee13c2cd06cc38f9fe
Parents: e8e7209
Author: Shintaro Murakami <mrkm4ntr@gmail.com>
Authored: Wed Jul 4 17:48:51 2018 +0100
Committer: Kaxil Naik <kaxilnaik@apache.org>
Committed: Wed Jul 4 17:48:51 2018 +0100

----------------------------------------------------------------------
 airflow/contrib/kubernetes/worker_configuration.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/0523fbf0/airflow/contrib/kubernetes/worker_configuration.py
----------------------------------------------------------------------
diff --git a/airflow/contrib/kubernetes/worker_configuration.py b/airflow/contrib/kubernetes/worker_configuration.py
index 4abeba2..51b51e8 100644
--- a/airflow/contrib/kubernetes/worker_configuration.py
+++ b/airflow/contrib/kubernetes/worker_configuration.py
@@ -19,6 +19,7 @@ import copy
 import os
 import six
 
+from airflow.configuration import conf
 from airflow.contrib.kubernetes.pod import Pod, Resources
 from airflow.contrib.kubernetes.secret import Secret
 from airflow.utils.log.logging_mixin import LoggingMixin
@@ -81,7 +82,8 @@ class WorkerConfiguration(LoggingMixin):
         """Defines any necessary environment variables for the pod executor"""
         env = {
             'AIRFLOW__CORE__DAGS_FOLDER': '/tmp/dags',
-            'AIRFLOW__CORE__EXECUTOR': 'LocalExecutor'
+            'AIRFLOW__CORE__EXECUTOR': 'LocalExecutor',
+            'AIRFLOW__CORE__SQL_ALCHEMY_CONN': conf.get('core', 'SQL_ALCHEMY_CONN')
         }
         if self.kube_config.airflow_configmap:
             env['AIRFLOW__CORE__AIRFLOW_HOME'] = self.worker_airflow_home


Mime
View raw message