[airflow] branch v1-10-test updated: fixup! Allow overrides for pod_template_file (#11162)

[di...@apache.org]

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

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


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 844df32  fixup! Allow overrides for pod_template_file (#11162)
844df32 is described below

commit 844df3264f1e3b17348b433498830d780af555f2
Author: Daniel Imberman <da...@astronomer.io>
AuthorDate: Sun Sep 27 20:40:45 2020 -0700

    fixup! Allow overrides for pod_template_file (#11162)
---
 airflow/contrib/operators/kubernetes_pod_operator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airflow/contrib/operators/kubernetes_pod_operator.py b/airflow/contrib/operators/kubernetes_pod_operator.py
index d9570d9..5053299 100644
--- a/airflow/contrib/operators/kubernetes_pod_operator.py
+++ b/airflow/contrib/operators/kubernetes_pod_operator.py
@@ -21,7 +21,6 @@ import yaml
 
 from airflow.exceptions import AirflowException
 from airflow.kubernetes import kube_client, pod_generator, pod_launcher
-from airflow.kubernetes.k8s_model import append_to_pod
 from airflow.kubernetes.pod import Resources
 from airflow.models import BaseOperator
 from airflow.utils.decorators import apply_defaults
@@ -29,6 +28,7 @@ from airflow.utils.helpers import validate_key
 from airflow.utils.state import State
 from airflow.version import version as airflow_version
 from airflow.kubernetes.pod_generator import PodGenerator
+from kubernetes.client import models as k8s
 
 
 class KubernetesPodOperator(BaseOperator):  # pylint: disable=too-many-instance-attributes