apache-airflow-providers-cncf-kubernetes 7.4.0__py3-none-any.whl → 7.4.1rc1__py3-none-any.whl

airflow/providers/cncf/kubernetes/__init__.py

@@ -28,7 +28,7 @@ import packaging.version
 
 __all__ = ["__version__"]
 
-__version__ = "7.4.0"
+__version__ = "7.4.1"
 
 try:
     from airflow import __version__ as airflow_version

airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py

@@ -23,6 +23,7 @@ KubernetesExecutor.
 """
 from __future__ import annotations
 
+import argparse
 import json
 import logging
 import multiprocessing
@@ -727,3 +728,11 @@ class KubernetesExecutor(BaseExecutor):
                 subcommands=KUBERNETES_COMMANDS,
             )
         ]
+
+
+def _get_parser() -> argparse.ArgumentParser:
+    """This method is used by Sphinx to generate documentation.
+
+    :meta private:
+    """
+    return KubernetesExecutor._get_parser()

airflow/providers/cncf/kubernetes/get_provider_info.py

@@ -29,6 +29,7 @@ def get_provider_info():
         "description": "`Kubernetes <https://kubernetes.io/>`__\n",
         "suspended": False,
         "versions": [
+            "7.4.1",
             "7.4.0",
             "7.3.0",
             "7.2.0",

airflow/providers/cncf/kubernetes/hooks/kubernetes.py

@@ -17,6 +17,7 @@
 from __future__ import annotations
 
 import contextlib
+import json
 import tempfile
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Generator
@@ -99,6 +100,12 @@ class KubernetesHook(BaseHook, PodOperatorHookProtocol):
             "cluster_context": StringField(lazy_gettext("Cluster context"), widget=BS3TextFieldWidget()),
             "disable_verify_ssl": BooleanField(lazy_gettext("Disable SSL")),
             "disable_tcp_keepalive": BooleanField(lazy_gettext("Disable TCP keepalive")),
+            "xcom_sidecar_container_image": StringField(
+                lazy_gettext("XCom sidecar image"), widget=BS3TextFieldWidget()
+            ),
+            "xcom_sidecar_container_resources": StringField(
+                lazy_gettext("XCom sidecar resources (JSON format)"), widget=BS3TextFieldWidget()
+            ),
         }
 
     @staticmethod
@@ -356,6 +363,17 @@ class KubernetesHook(BaseHook, PodOperatorHookProtocol):
             return self._get_field("namespace")
         return None
 
+    def get_xcom_sidecar_container_image(self):
+        """Returns the xcom sidecar image that defined in the connection."""
+        return self._get_field("xcom_sidecar_container_image")
+
+    def get_xcom_sidecar_container_resources(self):
+        """Returns the xcom sidecar resources that defined in the connection."""
+        field = self._get_field("xcom_sidecar_container_resources")
+        if not field:
+            return None
+        return json.loads(field)
+
     def get_pod_log_stream(
         self,
         pod_name: str,

airflow/providers/cncf/kubernetes/operators/pod.py

@@ -361,9 +361,7 @@ class KubernetesPodOperator(BaseOperator):
         self.get_logs = get_logs
         self.container_logs = container_logs
         if self.container_logs == KubernetesPodOperator.BASE_CONTAINER_NAME:
-            self.container_logs = (
-                base_container_name if base_container_name else KubernetesPodOperator.BASE_CONTAINER_NAME
-            )
+            self.container_logs = base_container_name if base_container_name else self.BASE_CONTAINER_NAME
         self.image_pull_policy = image_pull_policy
         self.node_selector = node_selector or {}
         self.annotations = annotations or {}
@@ -592,7 +590,9 @@ class KubernetesPodOperator(BaseOperator):
                     container_logs=self.container_logs,
                     follow_logs=True,
                 )
-            else:
+            if not self.get_logs or (
+                self.container_logs is not True and self.base_container_name not in self.container_logs
+            ):
                 self.pod_manager.await_container_completion(
                     pod=self.pod, container_name=self.base_container_name
                 )
@@ -762,7 +762,10 @@ class KubernetesPodOperator(BaseOperator):
                     self.log.info("Skipping deleting pod: %s", pod.metadata.name)
 
     def _build_find_pod_label_selector(self, context: Context | None = None, *, exclude_checked=True) -> str:
-        labels = self._get_ti_pod_labels(context, include_try_number=False)
+        labels = {
+            **self.labels,
+            **self._get_ti_pod_labels(context, include_try_number=False),
+        }
         label_strings = [f"{label_id}={label}" for label_id, label in sorted(labels.items())]
         labels_value = ",".join(label_strings)
         if exclude_checked:
@@ -880,7 +883,11 @@ class KubernetesPodOperator(BaseOperator):
             pod = secret.attach_to_pod(pod)
         if self.do_xcom_push:
             self.log.debug("Adding xcom sidecar to task %s", self.task_id)
-            pod = xcom_sidecar.add_xcom_sidecar(pod)
+            pod = xcom_sidecar.add_xcom_sidecar(
+                pod,
+                sidecar_container_image=self.hook.get_xcom_sidecar_container_image(),
+                sidecar_container_resources=self.hook.get_xcom_sidecar_container_resources(),
+            )
 
         labels = self._get_ti_pod_labels(context)
         self.log.info("Building pod %s with labels: %s", pod.metadata.name, labels)

airflow/providers/cncf/kubernetes/utils/pod_manager.py

@@ -101,6 +101,12 @@ class PodOperatorHookProtocol(Protocol):
     def get_namespace(self) -> str | None:
         """Returns the namespace that defined in the connection."""
 
+    def get_xcom_sidecar_container_image(self) -> str | None:
+        """Returns the xcom sidecar image that defined in the connection."""
+
+    def get_xcom_sidecar_container_resources(self) -> str | None:
+        """Returns the xcom sidecar resources that defined in the connection."""
+
 
 def get_container_status(pod: V1Pod, container_name: str) -> V1ContainerStatus | None:
     """Retrieves container status."""

{apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info → apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info}/METADATA

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-cncf-kubernetes
-Version: 7.4.0
+Version: 7.4.1rc1
 Summary: Provider for Apache Airflow. Implements apache-airflow-providers-cncf-kubernetes package
 Home-page: https://airflow.apache.org/
 Download-URL: https://archive.apache.org/dist/airflow/providers
 Author: Apache Software Foundation
 Author-email: dev@airflow.apache.org
 License: Apache License 2.0
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/changelog.html
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
@@ -31,7 +31,7 @@ Requires-Python: ~=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: apache-airflow (>=2.4.0)
+Requires-Dist: apache-airflow (>=2.4.0.dev0)
 Requires-Dist: asgiref (>=3.5.2)
 Requires-Dist: cryptography (>=2.0.0)
 Requires-Dist: kubernetes (<24,>=21.7.0)
@@ -75,7 +75,7 @@ Requires-Dist: kubernetes-asyncio (<25,>=18.20.1)
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``7.4.0``
+Release: ``7.4.1rc1``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -88,7 +88,7 @@ This is a provider package for ``cncf.kubernetes`` provider. All classes for thi
 are in ``airflow.providers.cncf.kubernetes`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/>`_.
 
 
 Installation
@@ -114,4 +114,4 @@ PIP package             Version required
 ======================  ==================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/changelog.html>`_.

{apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info → apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-airflow/providers/cncf/kubernetes/__init__.py,sha256=oDhCsIEtqmrHFj751UZxfqitrJlQRM2G4JksowkTKes,1584
-airflow/providers/cncf/kubernetes/get_provider_info.py,sha256=bmlxNJzjWqNaI_APrcweffJG9mzDw3s-NEP_LHgpxe0,15865
+airflow/providers/cncf/kubernetes/__init__.py,sha256=UIwpT7IQLH63kfJleOq1CPVNLESADcgNymHusA4dOqE,1584
+airflow/providers/cncf/kubernetes/get_provider_info.py,sha256=pDwe3siVIrE18BZNtdT7xLJRdNNGefKexzud0kAe67o,15886
 airflow/providers/cncf/kubernetes/k8s_model.py,sha256=yA5mZDLSicmwEF48V_yfXUz9ZsEyAVeFSn29WhzpJwU,2045
 airflow/providers/cncf/kubernetes/kube_client.py,sha256=QgOZmDb8arulCXil9LH4KA-iI1S8jMOhVSCFWDyOb3s,5344
 airflow/providers/cncf/kubernetes/kube_config.py,sha256=SZhMYmCJACkzxEFe0vcCW0m1XmoFpmDaIYf_Rl_uycA,4851
@@ -16,16 +16,16 @@ airflow/providers/cncf/kubernetes/backcompat/backwards_compat_converters.py,sha2
 airflow/providers/cncf/kubernetes/decorators/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
 airflow/providers/cncf/kubernetes/decorators/kubernetes.py,sha256=1BtTiZS0W1w_X-GixB1mXftgz2utPFT2ci2GX83sEY4,6178
 airflow/providers/cncf/kubernetes/executors/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py,sha256=e00ZTqMcHsvukjATb1Zb7oa9q2GpzQfZBpwMDh4nQmk,30257
+airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py,sha256=2eSdwAuX1LZwBbB_lijLvoPj8xoik-M0Lq2ps79X380,30457
 airflow/providers/cncf/kubernetes/executors/kubernetes_executor_types.py,sha256=JrGIamWOE82z_zr45w4VpviJGJGmwZ5gUICGGGwy1jg,1540
 airflow/providers/cncf/kubernetes/executors/kubernetes_executor_utils.py,sha256=L4wtjYU-6w60-NVHR6RhkS-IVoaQjWThlcDBIyJ3Wrc,21132
 airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py,sha256=RvFPYy6YJAyzBYkfJnNqtzNPB_IZBwEEajwQdgWa98U,9983
 airflow/providers/cncf/kubernetes/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/cncf/kubernetes/hooks/kubernetes.py,sha256=OSAQEquMd34Mp48BUtkXgtEkjz4jKQoCwdqCDl0Lszc,23140
+airflow/providers/cncf/kubernetes/hooks/kubernetes.py,sha256=EmW9DGLl_OkHID8vSvYq1JUCfH_QT5Gxn0hrkGScu_4,23948
 airflow/providers/cncf/kubernetes/kubernetes_executor_templates/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/cncf/kubernetes/operators/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
 airflow/providers/cncf/kubernetes/operators/kubernetes_pod.py,sha256=XvJgehU-4ZubJZ2vsekHX4DlCLlzBttXuZQlpVZZ2Ro,1262
-airflow/providers/cncf/kubernetes/operators/pod.py,sha256=_iaAJHPLJQSuBRdjdhyCDJXXlBFrh8ev872xC6MC0TI,41271
+airflow/providers/cncf/kubernetes/operators/pod.py,sha256=AE5qbjEgKtkQMHWotlT-jOo9t83LK__ildJhcsDZDW8,41626
 airflow/providers/cncf/kubernetes/operators/resource.py,sha256=cWpygD5-d8O3ja2U3oOd3kkSzUs5ya6uGVEQA-8eq9g,3827
 airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py,sha256=8PEtSlZ-8EPJepaBOFFnqWD0hBYVrjEhohbPZ9dtKBs,7387
 airflow/providers/cncf/kubernetes/pod_template_file_examples/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
@@ -37,12 +37,12 @@ airflow/providers/cncf/kubernetes/triggers/pod.py,sha256=-d_B1DHmFxnJDOkBMuIAcgl
 airflow/providers/cncf/kubernetes/utils/__init__.py,sha256=ClZN0VPjWySdVwS_ktH7rrgL9VLAcs3OSJSB9s3zaYw,863
 airflow/providers/cncf/kubernetes/utils/delete_from.py,sha256=wxpVlB7mYfwSdeIvPfH_scdT_uwO_7fxMSEztt5IOr8,5176
 airflow/providers/cncf/kubernetes/utils/k8s_hashlib_wrapper.py,sha256=HepA1Jnfbsr9iUZMGnG1zSGboV5l1RaWuTO02OGXoVc,1553
-airflow/providers/cncf/kubernetes/utils/pod_manager.py,sha256=ZIrbOqarKnjkKKVLm0hv1fAKnwzjaTfaknGk-j1M2iA,28943
+airflow/providers/cncf/kubernetes/utils/pod_manager.py,sha256=5JgrlXN2T0hNfVSmBJTOyli2GqsWTmEACCUjYfcmw5g,29231
 airflow/providers/cncf/kubernetes/utils/xcom_sidecar.py,sha256=GswqPXv24XQhAJGxt7PXrrDx0kVxIx3ljlRP2ix9Ews,2519
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/METADATA,sha256=6B9g1yQOFWUMgFI1SWFNAJA_HZdknptd-sN7nSRJ8lQ,4833
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/NOTICE,sha256=m-6s2XynUxVSUIxO4rVablAZCvFq-wmLrqV91DotRBw,240
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/entry_points.txt,sha256=GZl6SYJuUg-3koITGRd9PU1lBmqhecrKTeCQ6-wyHpM,112
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/top_level.txt,sha256=OeMVH5md7fr2QQWpnZoOWWxWO-0WH1IP70lpTVwopPg,8
-apache_airflow_providers_cncf_kubernetes-7.4.0.dist-info/RECORD,,
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/METADATA,sha256=i1kovGbx0zztuRmHYaF4yePfJXKiAx_Vey7GlO7ZhDY,4844
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/NOTICE,sha256=m-6s2XynUxVSUIxO4rVablAZCvFq-wmLrqV91DotRBw,240
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/WHEEL,sha256=AtBG6SXL3KF_v0NxLf0ehyVOh0cold-JbJYXNGorC6Q,92
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/entry_points.txt,sha256=GZl6SYJuUg-3koITGRd9PU1lBmqhecrKTeCQ6-wyHpM,112
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/top_level.txt,sha256=OeMVH5md7fr2QQWpnZoOWWxWO-0WH1IP70lpTVwopPg,8
+apache_airflow_providers_cncf_kubernetes-7.4.1rc1.dist-info/RECORD,,