apache-airflow-providers-cncf-kubernetes 9.0.1rc1__tar.gz → 10.0.0__tar.gz

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apache-airflow-providers-cncf-kubernetes
-Version: 9.0.1rc1
+Version: 10.0.0
 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,15 +21,15 @@ 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.8.0rc0
+Requires-Dist: apache-airflow>=2.8.0
 Requires-Dist: asgiref>=3.5.2
 Requires-Dist: cryptography>=41.0.0
 Requires-Dist: google-re2>=1.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/9.0.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/9.0.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://twitter.com/ApacheAirflow
@@ -79,7 +79,7 @@ Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``9.0.1.rc1``
+Release: ``10.0.0``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -92,7 +92,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/9.0.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0/>`_.
 
 Installation
 ------------
@@ -119,4 +119,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/9.0.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0/changelog.html>`_.

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-cncf-kubernetes``
 
-Release: ``9.0.1.rc1``
+Release: ``10.0.0``
 
 
 `Kubernetes <https://kubernetes.io/>`__
@@ -55,7 +55,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/9.0.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0/>`_.
 
 Installation
 ------------
@@ -82,4 +82,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/9.0.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-cncf-kubernetes/10.0.0/changelog.html>`_.

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/__init__.py

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

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/decorators/kubernetes.py

@@ -65,7 +65,7 @@ class _KubernetesDecoratedOperator(DecoratedOperator, KubernetesPodOperator):
     # there are some cases we can't deepcopy the objects (e.g protobuf).
     shallow_copy_attrs: Sequence[str] = ("python_callable",)
 
-    def __init__(self, namespace: str = "default", use_dill: bool = False, **kwargs) -> None:
+    def __init__(self, namespace: str | None = None, use_dill: bool = False, **kwargs) -> None:
         self.use_dill = use_dill
         super().__init__(
             namespace=namespace,

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py

@@ -768,8 +768,13 @@ class KubernetesExecutor(BaseExecutor):
             self.result_queue.join()
         except ConnectionResetError:
             self.log.exception("Connection Reset error while flushing task_queue and result_queue.")
+        except Exception:
+            self.log.exception("Unknown error while flushing task queue and result queue.")
         if self.kube_scheduler:
-            self.kube_scheduler.terminate()
+            try:
+                self.kube_scheduler.terminate()
+            except Exception:
+                self.log.exception("Unknown error while flushing task queue and result queue.")
         self._manager.shutdown()
 
     def terminate(self):

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py

@@ -45,6 +45,7 @@ class LocalKubernetesExecutor(BaseExecutor):
     """
 
     supports_ad_hoc_ti_run: bool = True
+    # TODO: Remove this attribute once providers rely on Airflow >=3.0.0
     supports_pickling: bool = False
     supports_sentry: bool = False
 
@@ -146,7 +147,6 @@ class LocalKubernetesExecutor(BaseExecutor):
         self,
         task_instance: TaskInstance,
         mark_success: bool = False,
-        pickle_id: int | None = None,
         ignore_all_deps: bool = False,
         ignore_depends_on_past: bool = False,
         wait_for_past_depends_before_skipping: bool = False,
@@ -154,6 +154,7 @@ class LocalKubernetesExecutor(BaseExecutor):
         ignore_ti_state: bool = False,
         pool: str | None = None,
         cfg_path: str | None = None,
+        **kwargs,
     ) -> None:
         """Queues task instance via local or kubernetes executor."""
         from airflow.models.taskinstance import SimpleTaskInstance
@@ -162,10 +163,13 @@ class LocalKubernetesExecutor(BaseExecutor):
         self.log.debug(
             "Using executor: %s to queue_task_instance for %s", executor.__class__.__name__, task_instance.key
         )
+
+        if not hasattr(task_instance, "pickle_id"):
+            del kwargs["pickle_id"]
+
         executor.queue_task_instance(
             task_instance=task_instance,
             mark_success=mark_success,
-            pickle_id=pickle_id,
             ignore_all_deps=ignore_all_deps,
             ignore_depends_on_past=ignore_depends_on_past,
             wait_for_past_depends_before_skipping=wait_for_past_depends_before_skipping,
@@ -173,6 +177,7 @@ class LocalKubernetesExecutor(BaseExecutor):
             ignore_ti_state=ignore_ti_state,
             pool=pool,
             cfg_path=cfg_path,
+            **kwargs,
         )
 
     def get_task_log(self, ti: TaskInstance, try_number: int) -> tuple[list[str], list[str]]:

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/get_provider_info.py

@@ -30,6 +30,7 @@ def get_provider_info():
         "state": "ready",
         "source-date-epoch": 1730012271,
         "versions": [
+            "10.0.0",
             "9.0.1",
             "9.0.0",
             "8.4.2",

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py

@@ -23,12 +23,10 @@ from functools import cache
 from typing import TYPE_CHECKING
 
 import pendulum
-from deprecated import deprecated
 from kubernetes.client.rest import ApiException
 from slugify import slugify
 
 from airflow.configuration import conf
-from airflow.exceptions import AirflowProviderDeprecationWarning
 
 if TYPE_CHECKING:
     from airflow.models.taskinstancekey import TaskInstanceKey
@@ -62,22 +60,6 @@ def add_unique_suffix(*, name: str, rand_len: int = 8, max_len: int = POD_NAME_M
     return name[: max_len - len(suffix)].strip("-.") + suffix
 
 
-@deprecated(
-    reason="This function is deprecated. Please use `add_unique_suffix`",
-    category=AirflowProviderDeprecationWarning,
-)
-def add_pod_suffix(*, pod_name: str, rand_len: int = 8, max_len: int = POD_NAME_MAX_LENGTH) -> str:
-    """
-    Add random string to pod name while staying under max length.
-
-    :param pod_name: name of the pod
-    :param rand_len: length of the random string to append
-    :param max_len: maximum length of the pod name
-    :meta private:
-    """
-    return add_unique_suffix(name=pod_name, rand_len=rand_len, max_len=max_len)
-
-
 def create_unique_id(
     dag_id: str | None = None,
     task_id: str | None = None,
@@ -110,29 +92,6 @@ def create_unique_id(
         return base_name
 
 
-@deprecated(
-    reason="This function is deprecated. Please use `create_unique_id`.",
-    category=AirflowProviderDeprecationWarning,
-)
-def create_pod_id(
-    dag_id: str | None = None,
-    task_id: str | None = None,
-    *,
-    max_length: int = POD_NAME_MAX_LENGTH,
-    unique: bool = True,
-) -> str:
-    """
-    Generate unique pod ID given a dag_id and / or task_id.
-
-    :param dag_id: DAG ID
-    :param task_id: Task ID
-    :param max_length: max number of characters
-    :param unique: whether a random string suffix should be added
-    :return: A valid identifier for a kubernetes pod name
-    """
-    return create_unique_id(dag_id=dag_id, task_id=task_id, max_length=max_length, unique=unique)
-
-
 def annotations_to_key(annotations: dict[str, str]) -> TaskInstanceKey:
     """Build a TaskInstanceKey based on pod annotations."""
     log.debug("Creating task key for annotations %s", annotations)

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/operators/pod.py

@@ -26,8 +26,7 @@ import os
 import re
 import shlex
 import string
-import warnings
-from collections.abc import Container
+from collections.abc import Container, Mapping
 from contextlib import AbstractContextManager
 from enum import Enum
 from functools import cached_property
@@ -35,7 +34,6 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, Sequence
 
 import kubernetes
 import tenacity
-from deprecated import deprecated
 from kubernetes.client import CoreV1Api, V1Pod, models as k8s
 from kubernetes.client.exceptions import ApiException
 from kubernetes.stream import stream
@@ -44,7 +42,6 @@ from urllib3.exceptions import HTTPError
 from airflow.configuration import conf
 from airflow.exceptions import (
     AirflowException,
-    AirflowProviderDeprecationWarning,
     AirflowSkipException,
     TaskDeferred,
 )
@@ -215,18 +212,12 @@ class KubernetesPodOperator(BaseOperator):
     :param on_finish_action: What to do when the pod reaches its final state, or the execution is interrupted.
         If "delete_pod", the pod will be deleted regardless its state; if "delete_succeeded_pod",
         only succeeded pod will be deleted. You can set to "keep_pod" to keep the pod.
-    :param is_delete_operator_pod: What to do when the pod reaches its final
-        state, or the execution is interrupted. If True (default), delete the
-        pod; if False, leave the pod.
-        Deprecated - use `on_finish_action` instead.
     :param termination_message_policy: The termination message policy of the base container.
         Default value is "File"
     :param active_deadline_seconds: The active_deadline_seconds which translates to active_deadline_seconds
         in V1PodSpec.
     :param callbacks: KubernetesPodOperatorCallback instance contains the callbacks methods on different step
         of KubernetesPodOperator.
-    :param progress_callback: Callback function for receiving k8s container logs.
-        `progress_callback` is deprecated, please use :param `callbacks` instead.
     :param logging_interval: max time in seconds that task should be in deferred state before
         resuming to fetch the latest logs. If ``None``, then the task will remain in deferred state until pod
         is done, and no logs will be visible until that time.
@@ -404,19 +395,8 @@ class KubernetesPodOperator(BaseOperator):
         self.poll_interval = poll_interval
         self.remote_pod: k8s.V1Pod | None = None
         self.log_pod_spec_on_failure = log_pod_spec_on_failure
-        if is_delete_operator_pod is not None:
-            warnings.warn(
-                "`is_delete_operator_pod` parameter is deprecated, please use `on_finish_action`",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            self.on_finish_action = (
-                OnFinishAction.DELETE_POD if is_delete_operator_pod else OnFinishAction.KEEP_POD
-            )
-            self.is_delete_operator_pod = is_delete_operator_pod
-        else:
-            self.on_finish_action = OnFinishAction(on_finish_action)
-            self.is_delete_operator_pod = self.on_finish_action == OnFinishAction.DELETE_POD
+        self.on_finish_action = OnFinishAction(on_finish_action)
+        self.is_delete_operator_pod = self.on_finish_action == OnFinishAction.DELETE_POD
         self.termination_message_policy = termination_message_policy
         self.active_deadline_seconds = active_deadline_seconds
         self.logging_interval = logging_interval
@@ -436,7 +416,7 @@ class KubernetesPodOperator(BaseOperator):
     def _render_nested_template_fields(
         self,
         content: Any,
-        context: Context,
+        context: Mapping[str, Any],
         jinja_env: jinja2.Environment,
         seen_oids: set,
     ) -> None:
@@ -512,9 +492,7 @@ class KubernetesPodOperator(BaseOperator):
 
     @cached_property
     def pod_manager(self) -> PodManager:
-        return PodManager(
-            kube_client=self.client, callbacks=self.callbacks, progress_callback=self._progress_callback
-        )
+        return PodManager(kube_client=self.client, callbacks=self.callbacks)
 
     @cached_property
     def hook(self) -> PodOperatorHookProtocol:
@@ -563,7 +541,7 @@ class KubernetesPodOperator(BaseOperator):
 
     def get_or_create_pod(self, pod_request_obj: k8s.V1Pod, context: Context) -> k8s.V1Pod:
         if self.reattach_on_restart:
-            pod = self.find_pod(self.namespace or pod_request_obj.metadata.namespace, context=context)
+            pod = self.find_pod(pod_request_obj.metadata.namespace, context=context)
             if pod:
                 return pod
         self.log.debug("Starting pod:\n%s", yaml.safe_dump(pod_request_obj.to_dict()))
@@ -1161,10 +1139,6 @@ class KubernetesPodOperator(BaseOperator):
         pod = self.build_pod_request_obj()
         print(yaml.dump(prune_dict(pod.to_dict(), mode="strict")))
 
-    @deprecated(reason="use `trigger_reentry` instead.", category=AirflowProviderDeprecationWarning)
-    def execute_complete(self, context: Context, event: dict, **kwargs):
-        return self.trigger_reentry(context=context, event=event)
-
     def process_duplicate_label_pods(self, pod_list: list[k8s.V1Pod]) -> k8s.V1Pod:
         """
         Patch or delete the existing pod with duplicate labels.

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/operators/spark_kubernetes.py

@@ -17,6 +17,7 @@
 # under the License.
 from __future__ import annotations
 
+from collections.abc import Mapping
 from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
@@ -67,6 +68,7 @@ class SparkKubernetesOperator(KubernetesPodOperator):
         state, or the execution is interrupted. If True (default), delete the
         pod; if False, leave the pod.
     :param kubernetes_conn_id: the connection to Kubernetes cluster
+    :param random_name_suffix: If True, adds a random suffix to the pod name
     """
 
     template_fields = ["application_file", "namespace", "template_spec", "kubernetes_conn_id"]
@@ -93,10 +95,9 @@ class SparkKubernetesOperator(KubernetesPodOperator):
         reattach_on_restart: bool = True,
         delete_on_termination: bool = True,
         kubernetes_conn_id: str = "kubernetes_default",
+        random_name_suffix: bool = True,
         **kwargs,
     ) -> None:
-        if kwargs.get("xcom_push") is not None:
-            raise AirflowException("'xcom_push' was deprecated, use 'do_xcom_push' instead")
         super().__init__(name=name, **kwargs)
         self.image = image
         self.code_path = code_path
@@ -111,6 +112,7 @@ class SparkKubernetesOperator(KubernetesPodOperator):
         self.get_logs = get_logs
         self.log_events_on_failure = log_events_on_failure
         self.success_run_history_limit = success_run_history_limit
+        self.random_name_suffix = random_name_suffix
 
         if self.base_container_name != self.BASE_CONTAINER_NAME:
             self.log.warning(
@@ -127,7 +129,7 @@ class SparkKubernetesOperator(KubernetesPodOperator):
     def _render_nested_template_fields(
         self,
         content: Any,
-        context: Context,
+        context: Mapping[str, Any],
         jinja_env: jinja2.Environment,
         seen_oids: set,
     ) -> None:
@@ -163,7 +165,11 @@ class SparkKubernetesOperator(KubernetesPodOperator):
             self.name or self.template_body.get("spark", {}).get("metadata", {}).get("name") or self.task_id
         )
 
-        updated_name = add_unique_suffix(name=name, max_len=MAX_LABEL_LEN)
+        if self.random_name_suffix:
+            updated_name = add_unique_suffix(name=name, max_len=MAX_LABEL_LEN)
+        else:
+            # truncation is required to maintain the same behavior as before
+            updated_name = name[:MAX_LABEL_LEN]
 
         return self._set_name(updated_name)
 

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/pod_generator.py

@@ -34,23 +34,16 @@ from typing import TYPE_CHECKING
 
 import re2
 from dateutil import parser
-from deprecated import deprecated
 from kubernetes.client import models as k8s
 from kubernetes.client.api_client import ApiClient
 
 from airflow.exceptions import (
     AirflowConfigException,
     AirflowException,
-    AirflowProviderDeprecationWarning,
 )
 from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import (
     POD_NAME_MAX_LENGTH,
     add_unique_suffix,
-    rand_str,
-)
-from airflow.providers.cncf.kubernetes.pod_generator_deprecated import (
-    PodDefaults as PodDefaultsDeprecated,
-    PodGenerator as PodGeneratorDeprecated,
 )
 from airflow.utils import yaml
 from airflow.utils.hashlib_wrapper import md5
@@ -155,40 +148,6 @@ class PodGenerator:
         # Attach sidecar
         self.extract_xcom = extract_xcom
 
-    @deprecated(
-        reason="This method is deprecated and will be removed in the future releases",
-        category=AirflowProviderDeprecationWarning,
-    )
-    def gen_pod(self) -> k8s.V1Pod:
-        """Generate pod."""
-        result = self.ud_pod
-
-        result.metadata.name = add_unique_suffix(name=result.metadata.name)
-
-        if self.extract_xcom:
-            result = self.add_xcom_sidecar(result)
-
-        return result
-
-    @staticmethod
-    @deprecated(
-        reason=(
-            "This function is deprecated. "
-            "Please use airflow.providers.cncf.kubernetes.utils.xcom_sidecar.add_xcom_sidecar instead"
-        ),
-        category=AirflowProviderDeprecationWarning,
-    )
-    def add_xcom_sidecar(pod: k8s.V1Pod) -> k8s.V1Pod:
-        """Add sidecar."""
-        pod_cp = copy.deepcopy(pod)
-        pod_cp.spec.volumes = pod.spec.volumes or []
-        pod_cp.spec.volumes.insert(0, PodDefaultsDeprecated.VOLUME)
-        pod_cp.spec.containers[0].volume_mounts = pod_cp.spec.containers[0].volume_mounts or []
-        pod_cp.spec.containers[0].volume_mounts.insert(0, PodDefaultsDeprecated.VOLUME_MOUNT)
-        pod_cp.spec.containers.append(PodDefaultsDeprecated.SIDECAR_CONTAINER)
-
-        return pod_cp
-
     @staticmethod
     def from_obj(obj) -> dict | k8s.V1Pod | None:
         """Convert to pod from obj."""
@@ -210,57 +169,11 @@ class PodGenerator:
 
         if isinstance(k8s_object, k8s.V1Pod):
             return k8s_object
-        elif isinstance(k8s_legacy_object, dict):
-            warnings.warn(
-                "Using a dictionary for the executor_config is deprecated and will soon be removed. "
-                'Please use a `kubernetes.client.models.V1Pod` class with a "pod_override" key'
-                " instead. ",
-                category=AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            return PodGenerator.from_legacy_obj(obj)
         else:
             raise TypeError(
                 "Cannot convert a non-kubernetes.client.models.V1Pod object into a KubernetesExecutorConfig"
             )
 
-    @staticmethod
-    def from_legacy_obj(obj) -> k8s.V1Pod | None:
-        """Convert to pod from obj."""
-        if obj is None:
-            return None
-
-        # We do not want to extract constant here from ExecutorLoader because it is just
-        # A name in dictionary rather than executor selection mechanism and it causes cyclic import
-        namespaced = obj.get("KubernetesExecutor", {})
-
-        if not namespaced:
-            return None
-
-        resources = namespaced.get("resources")
-
-        if resources is None:
-            requests = {
-                "cpu": namespaced.pop("request_cpu", None),
-                "memory": namespaced.pop("request_memory", None),
-                "ephemeral-storage": namespaced.get("ephemeral-storage"),  # We pop this one in limits
-            }
-            limits = {
-                "cpu": namespaced.pop("limit_cpu", None),
-                "memory": namespaced.pop("limit_memory", None),
-                "ephemeral-storage": namespaced.pop("ephemeral-storage", None),
-            }
-            all_resources = list(requests.values()) + list(limits.values())
-            if all(r is None for r in all_resources):
-                resources = None
-            else:
-                # remove None's so they don't become 0's
-                requests = {k: v for k, v in requests.items() if v is not None}
-                limits = {k: v for k, v in limits.items() if v is not None}
-                resources = k8s.V1ResourceRequirements(requests=requests, limits=limits)
-        namespaced["resources"] = resources
-        return PodGeneratorDeprecated(**namespaced).gen_pod()
-
     @staticmethod
     def reconcile_pods(base_pod: k8s.V1Pod, client_pod: k8s.V1Pod | None) -> k8s.V1Pod:
         """
@@ -579,37 +492,6 @@ class PodGenerator:
         api_client = ApiClient()
         return api_client._ApiClient__deserialize_model(pod_dict, k8s.V1Pod)
 
-    @staticmethod
-    @deprecated(
-        reason="This method is deprecated. Use `add_pod_suffix` in `kubernetes_helper_functions`.",
-        category=AirflowProviderDeprecationWarning,
-    )
-    def make_unique_pod_id(pod_id: str) -> str | None:
-        r"""
-        Generate a unique Pod name.
-
-        Kubernetes pod names must consist of one or more lowercase
-        rfc1035/rfc1123 labels separated by '.' with a maximum length of 253
-        characters.
-
-        Name must pass the following regex for validation
-        ``^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$``
-
-        For more details, see:
-        https://github.com/kubernetes/kubernetes/blob/release-1.1/docs/design/identifiers.md
-
-        :param pod_id: requested pod name
-        :return: ``str`` valid Pod name of appropriate length
-        """
-        if not pod_id:
-            return None
-
-        max_pod_id_len = 100  # arbitrarily chosen
-        suffix = rand_str(8)  # 8 seems good enough
-        base_pod_id_len = max_pod_id_len - len(suffix) - 1  # -1 for separator
-        trimmed_pod_id = pod_id[:base_pod_id_len].rstrip("-.")
-        return f"{trimmed_pod_id}-{suffix}"
-
 
 def merge_objects(base_obj, client_obj):
     """

{apache_airflow_providers_cncf_kubernetes-9.0.1rc1 → apache_airflow_providers_cncf_kubernetes-10.0.0}/airflow/providers/cncf/kubernetes/triggers/pod.py

@@ -19,12 +19,10 @@ from __future__ import annotations
 import asyncio
 import datetime
 import traceback
-import warnings
 from enum import Enum
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, AsyncIterator
 
-from airflow.exceptions import AirflowProviderDeprecationWarning
 from airflow.providers.cncf.kubernetes.hooks.kubernetes import AsyncKubernetesHook
 from airflow.providers.cncf.kubernetes.utils.pod_manager import (
     OnFinishAction,
@@ -71,10 +69,6 @@ class KubernetesPodTrigger(BaseTrigger):
     :param on_finish_action: What to do when the pod reaches its final state, or the execution is interrupted.
         If "delete_pod", the pod will be deleted regardless its state; if "delete_succeeded_pod",
         only succeeded pod will be deleted. You can set to "keep_pod" to keep the pod.
-    :param should_delete_pod: What to do when the pod reaches its final
-        state, or the execution is interrupted. If True (default), delete the
-        pod; if False, leave the pod.
-        Deprecated - use `on_finish_action` instead.
     :param logging_interval: number of seconds to wait before kicking it back to
         the operator to print latest logs. If ``None`` will wait until container done.
     :param last_log_time: where to resume logs from
@@ -95,7 +89,6 @@ class KubernetesPodTrigger(BaseTrigger):
         startup_timeout: int = 120,
         startup_check_interval: int = 5,
         on_finish_action: str = "delete_pod",
-        should_delete_pod: bool | None = None,
         last_log_time: DateTime | None = None,
         logging_interval: int | None = None,
     ):
@@ -114,20 +107,7 @@ class KubernetesPodTrigger(BaseTrigger):
         self.startup_check_interval = startup_check_interval
         self.last_log_time = last_log_time
         self.logging_interval = logging_interval
-
-        if should_delete_pod is not None:
-            warnings.warn(
-                "`should_delete_pod` parameter is deprecated, please use `on_finish_action`",
-                category=AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            self.on_finish_action = (
-                OnFinishAction.DELETE_POD if should_delete_pod else OnFinishAction.KEEP_POD
-            )
-            self.should_delete_pod = should_delete_pod
-        else:
-            self.on_finish_action = OnFinishAction(on_finish_action)
-            self.should_delete_pod = self.on_finish_action == OnFinishAction.DELETE_POD
+        self.on_finish_action = OnFinishAction(on_finish_action)
 
         self._since_time = None
 
@@ -148,7 +128,6 @@ class KubernetesPodTrigger(BaseTrigger):
                 "startup_timeout": self.startup_timeout,
                 "startup_check_interval": self.startup_check_interval,
                 "trigger_start_time": self.trigger_start_time,
-                "should_delete_pod": self.should_delete_pod,
                 "on_finish_action": self.on_finish_action.value,
                 "last_log_time": self.last_log_time,
                 "logging_interval": self.logging_interval,