[airflow] branch v1-10-test updated (145b808 -> 6e92e21)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a change to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git.


    omit 145b808  fixup! fixup! [AIRFLOW-5413] Allow K8S worker pod to be configured from JSON/YAML file (#6230)
     new 6e92e21  fixup! fixup! [AIRFLOW-5413] Allow K8S worker pod to be configured from JSON/YAML file (#6230)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (145b808)
            \
             N -- N -- N   refs/heads/v1-10-test (6e92e21)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 airflow/kubernetes/pod_generator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[airflow] 01/01: fixup! fixup! [AIRFLOW-5413] Allow K8S worker pod to be configured from JSON/YAML file (#6230)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 6e92e218b7bd0dae3ce46cd0a84fb9ee9beb9bdf
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Mon Jun 29 10:41:11 2020 +0200

    fixup! fixup! [AIRFLOW-5413] Allow K8S worker pod to be configured from JSON/YAML file (#6230)
---
 airflow/kubernetes/pod_generator.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/airflow/kubernetes/pod_generator.py b/airflow/kubernetes/pod_generator.py
index d79134a..e46407b 100644
--- a/airflow/kubernetes/pod_generator.py
+++ b/airflow/kubernetes/pod_generator.py
@@ -45,10 +45,14 @@ MAX_LABEL_LEN = 63
 MAX_POD_ID_LEN = 253
 
 
-class PodDefaults:
+class PodDefaults(object):
     """
     Static defaults for the PodGenerator
     """
+
+    def __init__(self):
+        pass
+
     XCOM_MOUNT_PATH = '/airflow/xcom'
     SIDECAR_CONTAINER_NAME = 'airflow-xcom-sidecar'
     XCOM_CMD = 'trap "exit 0" INT; while true; do sleep 30; done;'
@@ -92,7 +96,7 @@ def make_safe_label_value(string):
     return safe_label
 
 
-class PodGenerator:
+class PodGenerator(object):
     """
     Contains Kubernetes Airflow Worker configuration logic