You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by ka...@apache.org on 2020/08/19 22:33:08 UTC
[airflow] branch v1-10-stable updated (779fbe0 -> 374ae30)
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a change to branch v1-10-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git.
from 779fbe0 Update Changelog for 1.10.12rc2
new ec32e0a BugFix: K8s Executor Multinamespace mode is evaluated to true by default (#10410)
new 374ae30 Fix failing insert-license pre-commit check
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.pre-commit-config.yaml | 4 ++--
airflow/executors/kubernetes_executor.py | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
[airflow] 02/02: Fix failing insert-license pre-commit check
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 374ae30eedec724cecb9464386198a5e6fa8401f
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Tue Aug 18 20:01:36 2020 +0100
Fix failing insert-license pre-commit check
---
.pre-commit-config.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index eb91828..1fcd49d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ default_language_version:
minimum_pre_commit_version: "1.20.0"
repos:
- repo: https://github.com/Lucas-C/pre-commit-hooks
- rev: v1.1.8
+ rev: v1.1.9
hooks:
- id: forbid-tabs
exclude: ^docs/Makefile$
@@ -100,7 +100,7 @@ repos:
- id: insert-license
name: Add license for all XML files
exclude: ^\.github/.*$
- types: [xml]
+ files: .*\.xml$
args:
- --comment-style
- "<!--||-->"
[airflow] 01/02: BugFix: K8s Executor Multinamespace mode is
evaluated to true by default (#10410)
Posted by ka...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kaxilnaik pushed a commit to branch v1-10-stable
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit ec32e0af5faa43257b91bff21558c80df7ae10cc
Author: Kaxil Naik <ka...@gmail.com>
AuthorDate: Wed Aug 19 23:26:56 2020 +0100
BugFix: K8s Executor Multinamespace mode is evaluated to true by default (#10410)
(cherry picked from commit 3d334fdd98b1dd0e49b981c9cca70570a1da124e)
---
airflow/executors/kubernetes_executor.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/airflow/executors/kubernetes_executor.py b/airflow/executors/kubernetes_executor.py
index b6784a8..0ae8f16 100644
--- a/airflow/executors/kubernetes_executor.py
+++ b/airflow/executors/kubernetes_executor.py
@@ -163,7 +163,7 @@ class KubeConfig:
# cluster has RBAC enabled, your scheduler may need service account permissions to
# create, watch, get, and delete pods in this namespace.
self.kube_namespace = conf.get(self.kubernetes_section, 'namespace')
- self.multi_namespace_mode = conf.get(self.kubernetes_section, 'multi_namespace_mode')
+ self.multi_namespace_mode = conf.getboolean(self.kubernetes_section, 'multi_namespace_mode')
# The Kubernetes Namespace in which pods will be created by the executor. Note
# that if your
# cluster has RBAC enabled, your workers may need service account permissions to
@@ -265,14 +265,14 @@ class KubernetesJobWatcher(multiprocessing.Process, LoggingMixin):
def __init__(self,
namespace,
- mult_namespace_mode,
+ multi_namespace_mode,
watcher_queue,
resource_version,
worker_uuid,
kube_config):
multiprocessing.Process.__init__(self)
self.namespace = namespace
- self.multi_namespace_mode = mult_namespace_mode
+ self.multi_namespace_mode = multi_namespace_mode
self.worker_uuid = worker_uuid
self.watcher_queue = watcher_queue
self.resource_version = resource_version
@@ -403,7 +403,7 @@ class AirflowKubernetesScheduler(LoggingMixin):
resource_version = KubeResourceVersion.get_current_resource_version()
watcher = KubernetesJobWatcher(watcher_queue=self.watcher_queue,
namespace=self.kube_config.kube_namespace,
- mult_namespace_mode=self.kube_config.multi_namespace_mode,
+ multi_namespace_mode=self.kube_config.multi_namespace_mode,
resource_version=resource_version,
worker_uuid=self.worker_uuid,
kube_config=self.kube_config)