diff --git a/providers/cncf/kubernetes/pyproject.toml b/providers/cncf/kubernetes/pyproject.toml index cb257103ac690..bc140272b9ec5 100644 --- a/providers/cncf/kubernetes/pyproject.toml +++ b/providers/cncf/kubernetes/pyproject.toml @@ -60,7 +60,7 @@ requires-python = ">=3.10" dependencies = [ "aiofiles>=23.2.0", "apache-airflow>=2.11.0", - "apache-airflow-providers-common-compat>=1.10.1", + "apache-airflow-providers-common-compat>=1.10.1", # use next version "asgiref>=3.5.2", # TODO(potiuk): We should bump cryptography to >=46.0.0 when sqlalchemy>=2.0 is required "cryptography>=41.0.0,<46.0.0", diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py index 4756405523cda..6994819979e0a 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py @@ -58,7 +58,6 @@ lazy_load_command, positive_int, ) -from airflow.configuration import conf from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.executors.base_executor import BaseExecutor from airflow.providers.cncf.kubernetes.exceptions import PodMutationHookException, PodReconciliationError @@ -70,7 +69,7 @@ ) from airflow.providers.cncf.kubernetes.kube_config import KubeConfig from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import annotations_to_key -from airflow.providers.common.compat.sdk import Stats +from airflow.providers.common.compat.sdk import Stats, conf from airflow.utils.log.logging_mixin import remove_escape_codes from airflow.utils.session import NEW_SESSION, provide_session from airflow.utils.state import TaskInstanceState diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py index 0cc7fa9dbc1f1..f203a3ff37559 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/local_kubernetes_executor.py @@ -22,11 +22,11 @@ from deprecated import deprecated -from airflow.configuration import conf from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.executors.base_executor import BaseExecutor from airflow.providers.cncf.kubernetes.executors.kubernetes_executor import KubernetesExecutor from airflow.providers.cncf.kubernetes.version_compat import AIRFLOW_V_3_0_PLUS +from airflow.providers.common.compat.sdk import conf if TYPE_CHECKING: from airflow.callbacks.base_callback_sink import BaseCallbackSink diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_client.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_client.py index cc37ed755a61d..a4c5f405577ad 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_client.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_client.py @@ -22,7 +22,7 @@ import urllib3.util -from airflow.configuration import conf +from airflow.providers.common.compat.sdk import conf log = logging.getLogger(__name__) diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_config.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_config.py index 74d858169a880..af742d80b1212 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_config.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kube_config.py @@ -18,8 +18,8 @@ import warnings -from airflow.configuration import conf from airflow.exceptions import AirflowConfigException, AirflowProviderDeprecationWarning +from airflow.providers.common.compat.sdk import conf from airflow.settings import AIRFLOW_HOME diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py index 3646ff8b75c31..f15d460ff9950 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/kubernetes_helper_functions.py @@ -30,9 +30,8 @@ from sqlalchemy import select from urllib3.exceptions import HTTPError -from airflow.configuration import conf from airflow.providers.cncf.kubernetes.backcompat import get_logical_date_key -from airflow.providers.common.compat.sdk import AirflowException +from airflow.providers.common.compat.sdk import AirflowException, conf if TYPE_CHECKING: from airflow.models.taskinstancekey import TaskInstanceKey diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/job.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/job.py index 46cdb3a29fdb1..6fc3f2215fe55 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/job.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/job.py @@ -31,7 +31,6 @@ from kubernetes.client.api_client import ApiClient from kubernetes.client.rest import ApiException -from airflow.configuration import conf from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.providers.cncf.kubernetes.hooks.kubernetes import KubernetesHook from airflow.providers.cncf.kubernetes.kubernetes_helper_functions import ( @@ -44,7 +43,7 @@ from airflow.providers.cncf.kubernetes.triggers.job import KubernetesJobTrigger from airflow.providers.cncf.kubernetes.utils.pod_manager import EMPTY_XCOM_RESULT, PodNotFoundException from airflow.providers.cncf.kubernetes.version_compat import AIRFLOW_V_3_1_PLUS -from airflow.providers.common.compat.sdk import AirflowException +from airflow.providers.common.compat.sdk import AirflowException, conf from airflow.utils import yaml if AIRFLOW_V_3_1_PLUS: diff --git a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py index 54331fa6cef07..e6a0449cc8c00 100644 --- a/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py +++ b/providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py @@ -40,7 +40,6 @@ from kubernetes.stream import stream from urllib3.exceptions import HTTPError -from airflow.configuration import conf from airflow.providers.cncf.kubernetes import pod_generator from airflow.providers.cncf.kubernetes.backcompat.backwards_compat_converters import ( convert_affinity, @@ -86,7 +85,7 @@ from airflow.hooks.base import BaseHook # type: ignore[attr-defined, no-redef] from airflow.models import BaseOperator -from airflow.providers.common.compat.sdk import AirflowException, AirflowNotFoundException +from airflow.providers.common.compat.sdk import AirflowException, AirflowNotFoundException, conf from airflow.settings import pod_mutation_hook from airflow.utils import yaml from airflow.utils.helpers import prune_dict, validate_key diff --git a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/executors/test_local_kubernetes_executor.py b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/executors/test_local_kubernetes_executor.py index 44832e9083c76..69f291c574f9e 100644 --- a/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/executors/test_local_kubernetes_executor.py +++ b/providers/cncf/kubernetes/tests/unit/cncf/kubernetes/executors/test_local_kubernetes_executor.py @@ -22,11 +22,11 @@ import pytest from airflow.callbacks.callback_requests import CallbackRequest -from airflow.configuration import conf from airflow.executors.local_executor import LocalExecutor from airflow.providers.cncf.kubernetes.executors.local_kubernetes_executor import ( LocalKubernetesExecutor, ) +from airflow.providers.common.compat.sdk import conf from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS