apache-airflow-providers-cncf-kubernetes 10.5.0rc1__tar.gz → 10.5.0rc2__tar.gz

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-cncf-kubernetes
-Version: 10.5.0rc1
+Version: 10.5.0rc2
 Summary: Provider package apache-airflow-providers-cncf-kubernetes for Apache Airflow
 Keywords: airflow-provider,cncf.kubernetes,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/docs/changelog.rst

@@ -44,6 +44,13 @@ Features
 * ``Add 'test_connection' method to 'KubernetesHook' (#47881)``
 * ``Add '@task.kuberenetes_cmd'  (#46913)``
 
+Bug Fixes
+~~~~~~~~~
+
+* ``Pass workload to KubernetesExecutor using command args instead of init container (#50448)``
+* ``Fix KubernetesPodOperator AutomountServiceAccountToken from Pod Template (#50800)``
+* ``Fix broken imports of cncf.kubernetes for Airflow 2 (#50651)``
+
 Misc
 ~~~~
 
@@ -56,6 +63,7 @@ Misc
    * ``Update description of provider.yaml dependencies (#50231)``
    * ``Avoid committing history for providers (#49907)``
    * ``capitalize the term airflow (#49450)``
+   * ``Prepare release for providers May 2025 (#50531)``
 
 10.4.3
 ......

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-cncf-kubernetes"
-version = "10.5.0rc1"
+version = "10.5.0rc2"
 description = "Provider package apache-airflow-providers-cncf-kubernetes for Apache Airflow"
 readme = "README.rst"
 authors = [

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor_utils.py

@@ -398,8 +398,8 @@ class AirflowKubernetesScheduler(LoggingMixin):
                     "python",
                     "-m",
                     "airflow.sdk.execution_time.execute_workload",
-                    "--json-path",
-                    "/tmp/execute/input.json",
+                    "--json-string",
+                    ser_input,
                 ]
             else:
                 raise ValueError(
@@ -427,7 +427,6 @@ class AirflowKubernetesScheduler(LoggingMixin):
             date=None,
             run_id=run_id,
             args=list(command),
-            content_json_for_volume=ser_input,
             pod_override_object=kube_executor_config,
             base_worker_pod=base_worker_pod,
             with_mutation_hook=True,

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/src/airflow/providers/cncf/kubernetes/operators/pod.py

@@ -305,7 +305,7 @@ class KubernetesPodOperator(BaseOperator):
         node_selector: dict | None = None,
         image_pull_secrets: list[k8s.V1LocalObjectReference] | None = None,
         service_account_name: str | None = None,
-        automount_service_account_token: bool = True,
+        automount_service_account_token: bool | None = None,
         hostnetwork: bool = False,
         host_aliases: list[k8s.V1HostAlias] | None = None,
         tolerations: list[k8s.V1Toleration] | None = None,

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/src/airflow/providers/cncf/kubernetes/pod_generator.py

@@ -34,7 +34,7 @@ from functools import reduce
 from typing import TYPE_CHECKING
 
 from dateutil import parser
-from kubernetes.client import V1EmptyDirVolumeSource, V1Volume, V1VolumeMount, models as k8s
+from kubernetes.client import models as k8s
 from kubernetes.client.api_client import ApiClient
 
 from airflow.exceptions import (
@@ -287,7 +287,6 @@ class PodGenerator:
         scheduler_job_id: str,
         run_id: str | None = None,
         map_index: int = -1,
-        content_json_for_volume: str = "",
         *,
         with_mutation_hook: bool = False,
     ) -> k8s.V1Pod:
@@ -355,39 +354,6 @@ class PodGenerator:
             containers=[main_container],
         )
 
-        if content_json_for_volume:
-            import shlex
-
-            input_file_path = "/tmp/execute/input.json"
-            execute_volume = V1Volume(
-                name="execute-volume",
-                empty_dir=V1EmptyDirVolumeSource(),
-            )
-
-            execute_volume_mount = V1VolumeMount(
-                name="execute-volume",
-                mount_path="/tmp/execute",
-                read_only=False,
-            )
-
-            escaped_json = shlex.quote(content_json_for_volume)
-            init_container = k8s.V1Container(
-                name="init-container",
-                image="busybox",
-                command=["/bin/sh", "-c", f"echo {escaped_json} > {input_file_path}"],
-                volume_mounts=[execute_volume_mount],
-            )
-
-            main_container.volume_mounts = [execute_volume_mount]
-            main_container.command = args[:-1]
-            main_container.args = args[-1:]
-
-            podspec = k8s.V1PodSpec(
-                containers=[main_container],
-                volumes=[execute_volume],
-                init_containers=[init_container],
-            )
-
         dynamic_pod.spec = podspec
 
         # Reconcile the pods starting with the first chronologically,
@@ -546,7 +512,7 @@ def merge_objects(base_obj, client_obj):
 
     for base_key in base_obj.to_dict():
         base_val = getattr(base_obj, base_key, None)
-        if not getattr(client_obj, base_key, None) and base_val:
+        if not getattr(client_obj, base_key, None) and base_val is not None:
             if not isinstance(client_obj_cp, dict):
                 setattr(client_obj_cp, base_key, base_val)
             else:

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/src/airflow/providers/cncf/kubernetes/template_rendering.py

@@ -19,11 +19,14 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from jinja2 import TemplateAssertionError, UndefinedError
 from kubernetes.client.api_client import ApiClient
 
+from airflow.exceptions import AirflowException
 from airflow.providers.cncf.kubernetes.kube_config import KubeConfig
 from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import create_unique_id
 from airflow.providers.cncf.kubernetes.pod_generator import PodGenerator
+from airflow.utils.session import NEW_SESSION, provide_session
 
 if TYPE_CHECKING:
     from airflow.models.taskinstance import TaskInstance
@@ -58,3 +61,17 @@ def render_k8s_pod_yaml(task_instance: TaskInstance) -> dict | None:
     )
     sanitized_pod = ApiClient().sanitize_for_serialization(pod)
     return sanitized_pod
+
+
+@provide_session
+def get_rendered_k8s_spec(task_instance: TaskInstance, session=NEW_SESSION) -> dict | None:
+    """Fetch rendered template fields from DB."""
+    from airflow.models.renderedtifields import RenderedTaskInstanceFields
+
+    rendered_k8s_spec = RenderedTaskInstanceFields.get_k8s_pod_yaml(task_instance, session=session)
+    if not rendered_k8s_spec:
+        try:
+            rendered_k8s_spec = render_k8s_pod_yaml(task_instance)
+        except (TemplateAssertionError, UndefinedError) as e:
+            raise AirflowException(f"Unable to render a k8s spec for this taskinstance: {e}") from e
+    return rendered_k8s_spec

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/tests/unit/cncf/kubernetes/operators/test_pod.py

@@ -973,6 +973,7 @@ class TestKubernetesPodOperator:
                 foo: bar
             spec:
               serviceAccountName: foo
+              automountServiceAccountToken: false
               affinity:
                 nodeAffinity:
                   requiredDuringSchedulingIgnoredDuringExecution:
@@ -1036,6 +1037,8 @@ class TestKubernetesPodOperator:
         assert pod.spec.containers[0].image_pull_policy == "Always"
         assert pod.spec.containers[0].command == ["something"]
         assert pod.spec.service_account_name == "foo"
+        assert not pod.spec.automount_service_account_token
+
         affinity = {
             "node_affinity": {
                 "preferred_during_scheduling_ignored_during_execution": [

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/tests/unit/cncf/kubernetes/test_pod_generator.py

@@ -174,12 +174,7 @@ class TestPodGenerator:
                 '{"token":"mock","ti":{"id":"4d828a62-a417-4936-a7a6-2b3fabacecab","task_id":"mock","dag_id":"mock","run_id":"mock","try_number":1,"map_index":-1,"pool_slots":1,"queue":"default","priority_weight":1},"dag_rel_path":"mock.py","bundle_info":{"name":"n/a","version":"no matter"},"log_path":"mock.log","kind":"ExecuteTask"}',
                 '{"token":"mock","ti":{"id":"4d828a62-a417-4936-a7a6-2b3fabacecab","task_id":"mock","dag_id":"mock","run_id":"mock","try_number":1,"map_index":-1,"pool_slots":1,"queue":"default","priority_weight":1},"dag_rel_path":"mock.py","bundle_info":{"name":"n/a","version":"no matter"},"log_path":"mock.log","kind":"ExecuteTask"}',
                 id="regular-input",
-            ),
-            pytest.param(
-                '{"token":"mock","ti":{"id":"4d828a62-a417-4936-a7a6-2b3fabacecab","task_id":"moc\'k","dag_id":"mock","run_id":"mock","try_number":1,"map_index":-1,"pool_slots":1,"queue":"default","priority_weight":1},"dag_rel_path":"mock.py","bundle_info":{"name":"n/a","version":"no matter"},"log_path":"mock.log","kind":"ExecuteTask"}',
-                '{"token":"mock","ti":{"id":"4d828a62-a417-4936-a7a6-2b3fabacecab","task_id":"moc\'"\'"\'k","dag_id":"mock","run_id":"mock","try_number":1,"map_index":-1,"pool_slots":1,"queue":"default","priority_weight":1},"dag_rel_path":"mock.py","bundle_info":{"name":"n/a","version":"no matter"},"log_path":"mock.log","kind":"ExecuteTask"}',
-                id="input-with-single-quote-in-task-id",
-            ),
+            )
         ],
     )
     def test_pod_spec_for_task_sdk_runs(self, content_json, expected, data_file):
@@ -196,44 +191,25 @@ class TestPodGenerator:
                 "python",
                 "-m",
                 "airflow.sdk.execution_time.execute_workload",
-                "--json-path",
-                "/tmp/execute/input.json",
+                "--json-string",
+                content_json,
             ],
             pod_override_object=None,
             base_worker_pod=worker_config,
             namespace="namespace",
             scheduler_job_id="uuid",
-            content_json_for_volume=content_json,
         )
         sanitized_result = self.k8s_client.sanitize_for_serialization(result)
 
-        init_containers = sanitized_result["spec"]["initContainers"]
-        assert len(init_containers) == 1
-        init_container = init_containers[0]
-        assert init_container == {
-            "command": [
-                "/bin/sh",
-                "-c",
-                f"echo '{expected}' > /tmp/execute/input.json",
-            ],
-            "image": "busybox",
-            "name": "init-container",
-            "volumeMounts": [{"mountPath": "/tmp/execute", "name": "execute-volume", "readOnly": False}],
-        }
-
-        volumes = sanitized_result["spec"]["volumes"]
-        assert len(volumes) == 1
-        volume = volumes[0]
-        assert volume == {"emptyDir": {}, "name": "execute-volume"}
-
         main_container = sanitized_result["spec"]["containers"][0]
-        assert main_container["command"] == [
+
+        assert main_container["args"] == [
             "python",
             "-m",
             "airflow.sdk.execution_time.execute_workload",
-            "--json-path",
+            "--json-string",
+            expected,
         ]
-        assert main_container["args"] == ["/tmp/execute/input.json"]
 
     def test_from_obj_pod_override_object(self):
         obj = {

{apache_airflow_providers_cncf_kubernetes-10.5.0rc1 → apache_airflow_providers_cncf_kubernetes-10.5.0rc2}/tests/unit/cncf/kubernetes/test_template_rendering.py

@@ -24,8 +24,9 @@ import yaml
 from kubernetes.client import models as k8s
 from sqlalchemy.orm import make_transient
 
-from airflow.models.renderedtifields import RenderedTaskInstanceFields as RTIF
-from airflow.providers.cncf.kubernetes.template_rendering import render_k8s_pod_yaml
+from airflow.models.renderedtifields import RenderedTaskInstanceFields, RenderedTaskInstanceFields as RTIF
+from airflow.providers.cncf.kubernetes.template_rendering import get_rendered_k8s_spec, render_k8s_pod_yaml
+from airflow.providers.cncf.kubernetes.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils import timezone
 from airflow.utils.session import create_session
 from airflow.version import version
@@ -149,6 +150,39 @@ def test_render_k8s_pod_yaml_with_custom_pod_template_and_pod_override(
     assert ti_pod_yaml["metadata"]["annotations"]["test"] == "annotation"
 
 
+@pytest.mark.skipif(
+    AIRFLOW_V_3_0_PLUS,
+    reason="This test is only needed for Airflow 2 - we can remove it after "
+    "only Airflow 3 is supported in providers",
+)
+@mock.patch.dict(os.environ, {"AIRFLOW_IS_K8S_EXECUTOR_POD": "True"})
+@mock.patch.object(RenderedTaskInstanceFields, "get_k8s_pod_yaml")
+@mock.patch("airflow.providers.cncf.kubernetes.template_rendering.render_k8s_pod_yaml")
+def test_get_rendered_k8s_spec(render_k8s_pod_yaml, rtif_get_k8s_pod_yaml, create_task_instance):
+    # Create new TI for the same Task
+    ti = create_task_instance()
+
+    mock.patch.object(ti, "render_k8s_pod_yaml", autospec=True)
+
+    fake_spec = {"ermagawds": "pods"}
+
+    session = mock.Mock()
+
+    rtif_get_k8s_pod_yaml.return_value = fake_spec
+    assert get_rendered_k8s_spec(ti, session=session) == fake_spec
+
+    rtif_get_k8s_pod_yaml.assert_called_once_with(ti, session=session)
+    render_k8s_pod_yaml.assert_not_called()
+
+    # Now test that when we _dont_ find it in the DB, it calls render_k8s_pod_yaml
+    rtif_get_k8s_pod_yaml.return_value = None
+    render_k8s_pod_yaml.return_value = fake_spec
+
+    assert get_rendered_k8s_spec(session) == fake_spec
+
+    render_k8s_pod_yaml.assert_called_once()
+
+
 @mock.patch.dict(os.environ, {"AIRFLOW_IS_K8S_EXECUTOR_POD": "True"})
 @mock.patch("airflow.providers.cncf.kubernetes.template_rendering.render_k8s_pod_yaml")
 def test_get_k8s_pod_yaml(render_k8s_pod_yaml, dag_maker, session):