apache-airflow-providers-cncf-kubernetes 7.4.0__tar.gz → 7.4.1rc1__tar.gz

{apache-airflow-providers-cncf-kubernetes-7.4.0/apache_airflow_providers_cncf_kubernetes.egg-info → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/PKG-INFO

@@ -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
@@ -70,7 +70,7 @@ License-File: NOTICE
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``7.4.0``
+Release: ``7.4.1rc1``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -83,7 +83,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
@@ -109,4 +109,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 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/README.rst

@@ -36,7 +36,7 @@
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``7.4.0``
+Release: ``7.4.1rc1``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -49,7 +49,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
@@ -75,4 +75,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 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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()

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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",

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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,

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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)

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/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 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1/apache_airflow_providers_cncf_kubernetes.egg-info}/PKG-INFO

@@ -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
@@ -70,7 +70,7 @@ License-File: NOTICE
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``7.4.0``
+Release: ``7.4.1rc1``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -83,7 +83,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
@@ -109,4 +109,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 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/apache_airflow_providers_cncf_kubernetes.egg-info/requires.txt

@@ -1,4 +1,4 @@
-apache-airflow>=2.4.0
+apache-airflow>=2.4.0.dev0
 asgiref>=3.5.2
 cryptography>=2.0.0
 kubernetes<24,>=21.7.0

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/pyproject.toml

@@ -103,6 +103,7 @@ filterwarnings = [
 ]
 python_files = [
     "test_*.py",
+    "example_*.py",
 ]
 testpaths = [
     "tests",

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/setup.cfg

@@ -27,8 +27,8 @@ classifiers =
 	Programming Language :: Python :: 3.11
 	Topic :: System :: Monitoring
 project_urls = 
-	Documentation=https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/
-	Changelog=https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.0/changelog.html
+	Documentation=https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/
+	Changelog=https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/7.4.1/changelog.html
 	Bug Tracker=https://github.com/apache/airflow/issues
 	Source Code=https://github.com/apache/airflow
 	Slack Chat=https://s.apache.org/airflow-slack
@@ -47,7 +47,7 @@ setup_requires =
 	setuptools
 	wheel
 install_requires = 
-	apache-airflow>=2.4.0
+	apache-airflow>=2.4.0.dev0
 	asgiref>=3.5.2
 	cryptography>=2.0.0
 	kubernetes>=21.7.0,<24
@@ -61,6 +61,6 @@ apache_airflow_provider =
 packages = airflow.providers.cncf.kubernetes
 
 [egg_info]
-tag_build = 
+tag_build = rc1
 tag_date = 0
 

{apache-airflow-providers-cncf-kubernetes-7.4.0 → apache-airflow-providers-cncf-kubernetes-7.4.1rc1}/setup.py

@@ -26,7 +26,7 @@
 
 from setuptools import find_namespace_packages, setup
 
-version = "7.4.0"
+version = "7.4.1"
 
 
 def do_setup():