apache-airflow-providers-cncf-kubernetes 10.4.2__tar.gz → 10.4.3rc1__tar.gz

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-cncf-kubernetes
-Version: 10.4.2
+Version: 10.4.3rc1
 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>
@@ -21,14 +21,14 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: aiofiles>=23.2.0
-Requires-Dist: apache-airflow>=2.9.0
+Requires-Dist: apache-airflow>=2.9.0rc0
 Requires-Dist: asgiref>=3.5.2
 Requires-Dist: cryptography>=41.0.0
 Requires-Dist: kubernetes>=29.0.0,<=31.0.0
 Requires-Dist: kubernetes_asyncio>=29.0.0,<=31.0.0
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.2/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.2
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -59,7 +59,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``10.4.2``
+Release: ``10.4.3``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -72,7 +72,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/10.4.2/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/>`_.
 
 Installation
 ------------
@@ -98,5 +98,5 @@ 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/10.4.2/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/changelog.html>`_.
 

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``10.4.2``
+Release: ``10.4.3``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -36,7 +36,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/10.4.2/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/>`_.
 
 Installation
 ------------
@@ -62,4 +62,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/10.4.2/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/changelog.html>`_.

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/docs/changelog.rst

@@ -28,6 +28,23 @@ Changelog
 ---------
 
 
+10.4.3
+......
+
+Bug Fixes
+~~~~~~~~~
+
+* ``Remove 'subdir' arg from CLI commands (#49317)``
+
+Misc
+~~~~
+
+* ``Use contextlib.suppress(exception) instead of try-except-pass and add SIM105 ruff rule (#49251)``
+* ``remove superfluous else block (#49199)``
+* ``Remove unused db method in k8s provider (#49186)``
+
+
+
 10.4.2
 ......
 

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/docs/commits.rst

@@ -34,14 +34,29 @@ For high-level changelog, see :doc:`package information including changelog <ind
 
 
 
+10.4.3
+......
+
+Latest change: 2025-04-16
+
+==================================================================================================  ===========  ===================================================================================================
+Commit                                                                                              Committed    Subject
+==================================================================================================  ===========  ===================================================================================================
+`694bdc6c43 <https://github.com/apache/airflow/commit/694bdc6c43f926a20dd765e5a20a238884325c29>`__  2025-04-16   ``Remove 'subdir' arg from CLI commands (#49317)``
+`47bd8961a9 <https://github.com/apache/airflow/commit/47bd8961a9ce4e2cea0dbabd400d2508eb291948>`__  2025-04-15   ``Use contextlib.suppress(exception) instead of try-except-pass and add SIM105 ruff rule (#49251)``
+`cb295c351a <https://github.com/apache/airflow/commit/cb295c351a016c0a10cab07f2a628b865cff3ca3>`__  2025-04-14   ``remove superfluous else block (#49199)``
+`0ca0f17996 <https://github.com/apache/airflow/commit/0ca0f17996c86efb292cf5b10181944c67e3b862>`__  2025-04-13   ``Remove unused db method in k8s provider (#49186)``
+==================================================================================================  ===========  ===================================================================================================
+
 10.4.2
 ......
 
-Latest change: 2025-04-08
+Latest change: 2025-04-10
 
 ==================================================================================================  ===========  ==================================================================================
 Commit                                                                                              Committed    Subject
 ==================================================================================================  ===========  ==================================================================================
+`4a8567b20b <https://github.com/apache/airflow/commit/4a8567b20bdd6555cbdc936d6674bf4fa390b0d5>`__  2025-04-10   ``Prepare docs for Apr 2nd wave of providers (#49051)``
 `7b2ec33c7a <https://github.com/apache/airflow/commit/7b2ec33c7ad4998d9c9735b79593fcdcd3b9dd1f>`__  2025-04-08   ``Remove unnecessary entries in get_provider_info and update the schema (#48849)``
 `86d5b27f92 <https://github.com/apache/airflow/commit/86d5b27f92207571ebe0c29a42c42abbf6f8cb8c>`__  2025-04-08   ``Make '@task' import from airflow.sdk (#48896)``
 `139673d3ce <https://github.com/apache/airflow/commit/139673d3ce5552c2cf8bcb2d202e97342c4b237c>`__  2025-04-07   ``Remove fab from preinstalled providers (#48457)``

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/docs/index.rst

@@ -87,7 +87,7 @@ apache-airflow-providers-cncf-kubernetes package
 `Kubernetes <https://kubernetes.io/>`__
 
 
-Release: 10.4.2
+Release: 10.4.3
 
 Provider package
 ----------------

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/provider.yaml

@@ -22,9 +22,10 @@ description: |
     `Kubernetes <https://kubernetes.io/>`__
 
 state: ready
-source-date-epoch: 1744281222
+source-date-epoch: 1744788926
 # note that those versions are maintained by release manager - do not update them manually
 versions:
+  - 10.4.3
   - 10.4.2
   - 10.4.1
   - 10.4.0

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-cncf-kubernetes"
-version = "10.4.2"
+version = "10.4.3.rc1"
 description = "Provider package apache-airflow-providers-cncf-kubernetes for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -58,7 +58,7 @@ requires-python = "~=3.9"
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
     "aiofiles>=23.2.0",
-    "apache-airflow>=2.9.0",
+    "apache-airflow>=2.9.0rc0",
     "asgiref>=3.5.2",
     "cryptography>=41.0.0",
     # The Kubernetes API is known to introduce problems when upgraded to a MAJOR version. Airflow Core
@@ -112,8 +112,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.2"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.2/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.4.3/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"

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "10.4.2"
+__version__ = "10.4.3"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.9.0"

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/backcompat/backwards_compat_converters.py

@@ -27,20 +27,18 @@ def _convert_kube_model_object(obj, new_class):
     convert_op = getattr(obj, "to_k8s_client_obj", None)
     if callable(convert_op):
         return obj.to_k8s_client_obj()
-    elif isinstance(obj, new_class):
+    if isinstance(obj, new_class):
         return obj
-    else:
-        raise AirflowException(f"Expected {new_class}, got {type(obj)}")
+    raise AirflowException(f"Expected {new_class}, got {type(obj)}")
 
 
 def _convert_from_dict(obj, new_class):
     if isinstance(obj, new_class):
         return obj
-    elif isinstance(obj, dict):
+    if isinstance(obj, dict):
         api_client = ApiClient()
         return api_client._ApiClient__deserialize_model(obj, new_class)
-    else:
-        raise AirflowException(f"Expected dict or {new_class}, got {type(obj)}")
+    raise AirflowException(f"Expected dict or {new_class}, got {type(obj)}")
 
 
 def convert_volume(volume) -> k8s.V1Volume:
@@ -111,8 +109,7 @@ def convert_image_pull_secrets(image_pull_secrets) -> list[k8s.V1LocalObjectRefe
     if isinstance(image_pull_secrets, str):
         secrets = image_pull_secrets.split(",")
         return [k8s.V1LocalObjectReference(name=secret) for secret in secrets]
-    else:
-        return image_pull_secrets
+    return image_pull_secrets
 
 
 def convert_configmap(configmaps) -> k8s.V1EnvFromSource:

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/cli/kubernetes_command.py

@@ -43,7 +43,10 @@ from airflow.utils.providers_configuration_loader import providers_configuration
 def generate_pod_yaml(args):
     """Generate yaml files for each task in the DAG. Used for testing output of KubernetesExecutor."""
     logical_date = args.logical_date if AIRFLOW_V_3_0_PLUS else args.execution_date
-    dag = get_dag(subdir=args.subdir, dag_id=args.dag_id)
+    if AIRFLOW_V_3_0_PLUS:
+        dag = get_dag(bundle_names=args.bundle_name, dag_id=args.dag_id)
+    else:
+        dag = get_dag(subdir=args.subdir, dag_id=args.dag_id)
     yaml_output_path = args.output_path
     if AIRFLOW_V_3_0_PLUS:
         dr = DagRun(dag.dag_id, logical_date=logical_date)

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py

@@ -52,7 +52,6 @@ except ImportError:  # 2.x compatibility.
 from airflow.cli.cli_config import (
     ARG_DAG_ID,
     ARG_OUTPUT_PATH,
-    ARG_SUBDIR,
     ARG_VERBOSE,
     ActionCommand,
     Arg,
@@ -94,6 +93,16 @@ if TYPE_CHECKING:
         AirflowKubernetesScheduler,
     )
 
+
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.cli.cli_config import ARG_BUNDLE_NAME
+
+    ARG_COMPAT = ARG_BUNDLE_NAME
+else:
+    from airflow.cli.cli_config import ARG_SUBDIR  # type: ignore[attr-defined]
+
+    ARG_COMPAT = ARG_SUBDIR
+
 # CLI Args
 ARG_NAMESPACE = Arg(
     ("--namespace",),
@@ -128,7 +137,7 @@ KUBERNETES_COMMANDS = (
         help="Generate YAML files for all tasks in DAG. Useful for debugging tasks without "
         "launching into a cluster",
         func=lazy_load_command("airflow.providers.cncf.kubernetes.cli.kubernetes_command.generate_pod_yaml"),
-        args=(ARG_DAG_ID, ARG_LOGICAL_DATE, ARG_SUBDIR, ARG_OUTPUT_PATH, ARG_VERBOSE),
+        args=(ARG_DAG_ID, ARG_LOGICAL_DATE, ARG_COMPAT, ARG_OUTPUT_PATH, ARG_VERBOSE),
     ),
 )
 
@@ -482,7 +491,7 @@ class KubernetesExecutor(BaseExecutor):
             ).items
             if not pod_list:
                 raise RuntimeError("Cannot find pod for ti %s", ti)
-            elif len(pod_list) > 1:
+            if len(pod_list) > 1:
                 raise RuntimeError("Found multiple pods for ti %s: %s", ti, pod_list)
             res = client.read_namespaced_pod_log(
                 name=pod_list[0].metadata.name,

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

@@ -110,8 +110,7 @@ class KubernetesJobWatcher(multiprocessing.Process, LoggingMixin):
         try:
             if self.namespace == ALL_NAMESPACES:
                 return watcher.stream(kube_client.list_pod_for_all_namespaces, **query_kwargs)
-            else:
-                return watcher.stream(kube_client.list_namespaced_pod, self.namespace, **query_kwargs)
+            return watcher.stream(kube_client.list_namespaced_pod, self.namespace, **query_kwargs)
         except ApiException as e:
             if str(e.status) == "410":  # Resource version is too old
                 if self.namespace == ALL_NAMESPACES:
@@ -121,8 +120,7 @@ class KubernetesJobWatcher(multiprocessing.Process, LoggingMixin):
                 resource_version = pods.metadata.resource_version
                 query_kwargs["resource_version"] = resource_version
                 return self._pod_events(kube_client=kube_client, query_kwargs=query_kwargs)
-            else:
-                raise
+            raise
 
     def _run(
         self,
@@ -564,5 +562,4 @@ def get_base_pod_from_template(pod_template_file: str | None, kube_config: Any)
     """
     if pod_template_file:
         return PodGenerator.deserialize_model_file(pod_template_file)
-    else:
-        return PodGenerator.deserialize_model_file(kube_config.pod_template_file)
+    return PodGenerator.deserialize_model_file(kube_config.pod_template_file)

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/hooks/kubernetes.py

@@ -177,8 +177,7 @@ class KubernetesHook(BaseHook, PodOperatorHookProtocol):
         except AirflowNotFoundException:
             if conn_id == cls.default_conn_name:
                 return Connection(conn_id=cls.default_conn_name)
-            else:
-                raise
+            raise
 
     @cached_property
     def conn_extras(self):
@@ -691,9 +690,8 @@ class KubernetesHook(BaseHook, PodOperatorHookProtocol):
                 and replicas == ready_replicas
             ):
                 return
-            else:
-                self.log.info("Waiting until Deployment will be ready...")
-                sleep(polling_period_seconds)
+            self.log.info("Waiting until Deployment will be ready...")
+            sleep(polling_period_seconds)
 
             _timeout -= polling_period_seconds
 
@@ -713,10 +711,10 @@ def _get_bool(val) -> bool | None:
     """Convert val to bool if can be done with certainty; if we cannot infer intention we return None."""
     if isinstance(val, bool):
         return val
-    elif isinstance(val, str):
+    if isinstance(val, str):
         if val.strip().lower() == "true":
             return True
-        elif val.strip().lower() == "false":
+        if val.strip().lower() == "false":
             return False
     return None
 

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py

@@ -89,8 +89,7 @@ def create_unique_id(
     base_name = slugify(name, lowercase=True)[:max_length].strip(".-")
     if unique:
         return add_unique_suffix(name=base_name, rand_len=8, max_len=max_length)
-    else:
-        return base_name
+    return base_name
 
 
 def annotations_to_key(annotations: dict[str, str]) -> TaskInstanceKey:

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/operators/custom_object_launcher.py

@@ -18,6 +18,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import time
 from copy import deepcopy
 from datetime import datetime as dt
@@ -326,12 +327,10 @@ class CustomObjectLauncher(LoggingMixin):
         driver_state = spark_job_info.get("status", {}).get("applicationState", {}).get("state", "SUBMITTED")
         if driver_state == CustomObjectStatus.FAILED:
             err = spark_job_info.get("status", {}).get("applicationState", {}).get("errorMessage", "N/A")
-            try:
+            with contextlib.suppress(Exception):
                 self.pod_manager.fetch_container_logs(
                     pod=self.pod_spec, container_name="spark-kubernetes-driver"
                 )
-            except Exception:
-                pass
             raise AirflowException(f"Spark Job Failed. Error stack: {err}")
         return driver_state == CustomObjectStatus.SUBMITTED
 

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/operators/job.py

@@ -389,7 +389,7 @@ class KubernetesJobOperator(KubernetesPodOperator):
             return base_spec
         if not base_spec and client_spec:
             return client_spec
-        elif client_spec and base_spec:
+        if client_spec and base_spec:
             client_spec.template.spec = PodGenerator.reconcile_specs(
                 base_spec.template.spec, client_spec.template.spec
             )

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/operators/kueue.py

@@ -101,7 +101,7 @@ class KubernetesStartKueueJobOperator(KubernetesJobOperator):
                 "The `suspend` parameter can't be False. If you want to use Kueue for running Job"
                 " in a Kubernetes cluster, set the `suspend` parameter to True.",
             )
-        elif self.suspend is None:
+        if self.suspend is None:
             self.log.info(
                 "You have not set parameter `suspend` in class %s. "
                 "For running a Job in Kueue the `suspend` parameter has been set to True.",

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

@@ -857,7 +857,7 @@ class KubernetesPodOperator(BaseOperator):
                 message = event.get("stack_trace", event["message"])
                 raise AirflowException(message)
 
-            elif event["status"] == "running":
+            if event["status"] == "running":
                 if self.get_logs:
                     self.log.info("Resuming logs read from time %r", last_log_time)
 
@@ -1297,7 +1297,7 @@ class _optionally_suppress(AbstractContextManager):
         matching_error = error and issubclass(exctype, self._exceptions)
         if (error and not matching_error) or (matching_error and self.reraise):
             return False
-        elif matching_error:
+        if matching_error:
             self.exception = excinst
             logger = logging.getLogger(__name__)
             logger.exception(excinst)

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/operators/resource.py

@@ -99,8 +99,7 @@ class KubernetesResourceBaseOperator(BaseOperator):
     def get_namespace(self) -> str:
         if self._namespace:
             return self._namespace
-        else:
-            return self.hook.get_namespace() or "default"
+        return self.hook.get_namespace() or "default"
 
     def get_crd_fields(self, body: dict) -> tuple[str, str, str, str]:
         api_version = body["apiVersion"]

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py

@@ -245,7 +245,7 @@ class SparkKubernetesOperator(KubernetesPodOperator):
         pod = None
         if len(pod_list) > 1:  # and self.reattach_on_restart:
             raise AirflowException(f"More than one pod running with labels: {label_selector}")
-        elif len(pod_list) == 1:
+        if len(pod_list) == 1:
             pod = pod_list[0]
             self.log.info(
                 "Found matching driver pod %s with labels %s", pod.metadata.name, pod.metadata.labels

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/pod_generator.py

@@ -162,10 +162,9 @@ class PodGenerator:
 
         if isinstance(k8s_object, k8s.V1Pod):
             return k8s_object
-        else:
-            raise TypeError(
-                "Cannot convert a non-kubernetes.client.models.V1Pod object into a KubernetesExecutorConfig"
-            )
+        raise TypeError(
+            "Cannot convert a non-kubernetes.client.models.V1Pod object into a KubernetesExecutorConfig"
+        )
 
     @staticmethod
     def reconcile_pods(base_pod: k8s.V1Pod, client_pod: k8s.V1Pod | None) -> k8s.V1Pod:
@@ -203,7 +202,7 @@ class PodGenerator:
             return base_meta
         if not base_meta and client_meta:
             return client_meta
-        elif client_meta and base_meta:
+        if client_meta and base_meta:
             client_meta.labels = merge_objects(base_meta.labels, client_meta.labels)
             client_meta.annotations = merge_objects(base_meta.annotations, client_meta.annotations)
             extend_object_field(base_meta, client_meta, "managed_fields")
@@ -229,7 +228,7 @@ class PodGenerator:
             return base_spec
         if not base_spec and client_spec:
             return client_spec
-        elif client_spec and base_spec:
+        if client_spec and base_spec:
             client_spec.containers = PodGenerator.reconcile_containers(
                 base_spec.containers, client_spec.containers
             )

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/resource_convert/env_variable.py

@@ -33,7 +33,7 @@ def convert_env_vars(env_vars) -> list[k8s.V1EnvVar]:
         for k, v in env_vars.items():
             res.append(k8s.V1EnvVar(name=k, value=v))
         return res
-    elif isinstance(env_vars, list):
+    if isinstance(env_vars, list):
         if all([isinstance(e, k8s.V1EnvVar) for e in env_vars]):
             return env_vars
     raise AirflowException(f"Expected dict or list of V1EnvVar, got {type(env_vars)}")

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/sensors/spark_kubernetes.py

@@ -128,9 +128,8 @@ class SparkKubernetesSensor(BaseSensorOperator):
         if application_state in self.FAILURE_STATES:
             message = f"Spark application failed with state: {application_state}"
             raise AirflowException(message)
-        elif application_state in self.SUCCESS_STATES:
+        if application_state in self.SUCCESS_STATES:
             self.log.info("Spark application ended successfully")
             return True
-        else:
-            self.log.info("Spark application is still in state: %s", application_state)
-            return False
+        self.log.info("Spark application is still in state: %s", application_state)
+        return False

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/template_rendering.py

@@ -19,14 +19,11 @@ 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
@@ -61,17 +58,3 @@ 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.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/triggers/pod.py

@@ -236,7 +236,7 @@ class KubernetesPodTrigger(BaseTrigger):
                         "last_log_time": self.last_log_time,
                     }
                 )
-            elif container_state == ContainerState.FAILED:
+            if container_state == ContainerState.FAILED:
                 return TriggerEvent(
                     {
                         "status": "failed",
@@ -289,8 +289,7 @@ class KubernetesPodTrigger(BaseTrigger):
             if state_obj is not None:
                 if state != ContainerState.TERMINATED:
                     return state
-                else:
-                    return ContainerState.TERMINATED if state_obj.exit_code == 0 else ContainerState.FAILED
+                return ContainerState.TERMINATED if state_obj.exit_code == 0 else ContainerState.FAILED
         return ContainerState.UNDEFINED
 
     @staticmethod

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/src/airflow/providers/cncf/kubernetes/utils/pod_manager.py

@@ -520,15 +520,14 @@ class PodManager(LoggingMixin):
                 return PodLoggingStatus(running=False, last_log_time=last_log_time)
             if not follow:
                 return PodLoggingStatus(running=True, last_log_time=last_log_time)
-            else:
-                # a timeout is a normal thing and we ignore it and resume following logs
-                if not isinstance(exc, TimeoutError):
-                    self.log.warning(
-                        "Pod %s log read interrupted but container %s still running. Logs generated in the last one second might get duplicated.",
-                        pod.metadata.name,
-                        container_name,
-                    )
-                time.sleep(1)
+            # a timeout is a normal thing and we ignore it and resume following logs
+            if not isinstance(exc, TimeoutError):
+                self.log.warning(
+                    "Pod %s log read interrupted but container %s still running. Logs generated in the last one second might get duplicated.",
+                    pod.metadata.name,
+                    container_name,
+                )
+            time.sleep(1)
 
     def _reconcile_requested_log_containers(
         self, requested: Iterable[str] | str | bool | None, actual: list[str], pod_name

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/tests/unit/cncf/kubernetes/conftest.py

@@ -30,7 +30,7 @@ def data_file():
     if not DATA_FILE_DIRECTORY.exists():
         msg = f"Data Directory {DATA_FILE_DIRECTORY.as_posix()!r} does not exist."
         raise FileNotFoundError(msg)
-    elif not DATA_FILE_DIRECTORY.is_dir():
+    if not DATA_FILE_DIRECTORY.is_dir():
         msg = f"Data Directory {DATA_FILE_DIRECTORY.as_posix()!r} expected to be a directory."
         raise NotADirectoryError(msg)
 

{apache_airflow_providers_cncf_kubernetes-10.4.2 → apache_airflow_providers_cncf_kubernetes-10.4.3rc1}/tests/unit/cncf/kubernetes/test_template_rendering.py

@@ -24,8 +24,8 @@ import yaml
 from kubernetes.client import models as k8s
 from sqlalchemy.orm import make_transient
 
-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.models.renderedtifields import RenderedTaskInstanceFields as RTIF
+from airflow.providers.cncf.kubernetes.template_rendering import render_k8s_pod_yaml
 from airflow.utils import timezone
 from airflow.utils.session import create_session
 from airflow.version import version
@@ -149,34 +149,6 @@ def test_render_k8s_pod_yaml_with_custom_pod_template_and_pod_override(
     assert ti_pod_yaml["metadata"]["annotations"]["test"] == "annotation"
 
 
-@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):