[AIRFLOW-5501] Make default in_cluster value in KubernetesPodOperat…

…or respect config (#6124) (cherry-picked from e54fba5)
apache · Jan 23, 2020 · 645e021 · 645e021
1 parent 83447d3
commit 645e021
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/airflow/contrib/operators/kubernetes_pod_operator.py b/airflow/contrib/operators/kubernetes_pod_operator.py
@@ -126,7 +126,7 @@ def __init__(self,  # pylint: disable=too-many-arguments,too-many-locals
                  volumes=None,
                  env_vars=None,
                  secrets=None,
-                 in_cluster=True,
+                 in_cluster=None,
                  cluster_context=None,
                  labels=None,
                  startup_timeout_seconds=120,
@@ -191,9 +191,13 @@ def __init__(self,  # pylint: disable=too-many-arguments,too-many-locals
 
     def execute(self, context):
         try:
-            client = kube_client.get_kube_client(in_cluster=self.in_cluster,
-                                                 cluster_context=self.cluster_context,
-                                                 config_file=self.config_file)
+            if self.in_cluster is not None:
+                client = kube_client.get_kube_client(in_cluster=self.in_cluster,
+                                                     cluster_context=self.cluster_context,
+                                                     config_file=self.config_file)
+            else:
+                client = kube_client.get_kube_client(cluster_context=self.cluster_context,
+                                                     config_file=self.config_file)
 
             # Add Airflow Version to the label
             # And a label to identify that pod is launched by KubernetesPodOperator