This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new a4388ac4b3c Remove remaining pieces of k8s exec specific UI pages
(#47422)
a4388ac4b3c is described below
commit a4388ac4b3cc2c1ab953be6d6a44a6968da4b91a
Author: Niko Oliveira <[email protected]>
AuthorDate: Fri Mar 7 11:15:33 2025 -0800
Remove remaining pieces of k8s exec specific UI pages (#47422)
---
airflow/api_fastapi/core_api/datamodels/ui/config.py | 1 -
airflow/api_fastapi/core_api/openapi/v1-generated.yaml | 4 ----
airflow/api_fastapi/core_api/routes/ui/config.py | 3 +--
airflow/settings.py | 4 ----
airflow/ui/openapi-gen/requests/schemas.gen.ts | 5 -----
airflow/ui/openapi-gen/requests/types.gen.ts | 1 -
airflow/ui/src/mocks/handlers/config.ts | 1 -
tests/api_fastapi/core_api/routes/ui/test_config.py | 1 -
8 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/airflow/api_fastapi/core_api/datamodels/ui/config.py
b/airflow/api_fastapi/core_api/datamodels/ui/config.py
index 48a140be7a2..ad2b25c21f4 100644
--- a/airflow/api_fastapi/core_api/datamodels/ui/config.py
+++ b/airflow/api_fastapi/core_api/datamodels/ui/config.py
@@ -39,6 +39,5 @@ class ConfigResponse(BaseModel):
warn_deployment_exposure: bool
audit_view_excluded_events: str
audit_view_included_events: str
- is_k8s: bool
test_connection: str
state_color_mapping: dict
diff --git a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
index ea50f2d864c..ac9079c251d 100644
--- a/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
+++ b/airflow/api_fastapi/core_api/openapi/v1-generated.yaml
@@ -8001,9 +8001,6 @@ components:
audit_view_included_events:
type: string
title: Audit View Included Events
- is_k8s:
- type: boolean
- title: Is K8S
test_connection:
type: string
title: Test Connection
@@ -8029,7 +8026,6 @@ components:
- warn_deployment_exposure
- audit_view_excluded_events
- audit_view_included_events
- - is_k8s
- test_connection
- state_color_mapping
title: ConfigResponse
diff --git a/airflow/api_fastapi/core_api/routes/ui/config.py
b/airflow/api_fastapi/core_api/routes/ui/config.py
index e6e7c4b665d..a74e7911c2d 100644
--- a/airflow/api_fastapi/core_api/routes/ui/config.py
+++ b/airflow/api_fastapi/core_api/routes/ui/config.py
@@ -24,7 +24,7 @@ from airflow.api_fastapi.common.router import AirflowRouter
from airflow.api_fastapi.core_api.datamodels.ui.config import ConfigResponse
from airflow.api_fastapi.core_api.openapi.exceptions import
create_openapi_http_exception_doc
from airflow.configuration import conf
-from airflow.settings import IS_K8S_OR_K8SCELERY_EXECUTOR, STATE_COLORS
+from airflow.settings import STATE_COLORS
config_router = AirflowRouter(tags=["Config"])
@@ -62,7 +62,6 @@ def get_configs() -> ConfigResponse:
"audit_view_excluded_events": conf.get("webserver",
"audit_view_excluded_events", fallback=""),
"test_connection": conf.get("core", "test_connection",
fallback="Disabled"),
"state_color_mapping": STATE_COLORS,
- "is_k8s": IS_K8S_OR_K8SCELERY_EXECUTOR,
}
config.update({key: value for key, value in additional_config.items()})
diff --git a/airflow/settings.py b/airflow/settings.py
index ec702c4c2de..0c36d85ea00 100644
--- a/airflow/settings.py
+++ b/airflow/settings.py
@@ -37,7 +37,6 @@ from sqlalchemy.pool import NullPool
from airflow import __version__ as airflow_version, policies
from airflow.configuration import AIRFLOW_HOME, WEBSERVER_CONFIG, conf #
noqa: F401
from airflow.exceptions import AirflowInternalRuntimeError
-from airflow.executors import executor_constants
from airflow.logging_config import configure_logging
from airflow.utils.orm_event_handlers import setup_event_handlers
from airflow.utils.sqlalchemy import is_sqlalchemy_v1
@@ -681,9 +680,6 @@ LAZY_LOAD_PLUGINS: bool = conf.getboolean("core",
"lazy_load_plugins", fallback=
# loaded from module.
LAZY_LOAD_PROVIDERS: bool = conf.getboolean("core", "lazy_discover_providers",
fallback=True)
-# Determines if the executor utilizes Kubernetes
-IS_K8S_OR_K8SCELERY_EXECUTOR = conf.get("core", "EXECUTOR") ==
executor_constants.KUBERNETES_EXECUTOR
-
# Executors can set this to true to configure logging correctly for
# containerized executors.
IS_EXECUTOR_CONTAINER = bool(os.environ.get("AIRFLOW_IS_EXECUTOR_CONTAINER",
""))
diff --git a/airflow/ui/openapi-gen/requests/schemas.gen.ts
b/airflow/ui/openapi-gen/requests/schemas.gen.ts
index 6b38883451f..b8173c4dad0 100644
--- a/airflow/ui/openapi-gen/requests/schemas.gen.ts
+++ b/airflow/ui/openapi-gen/requests/schemas.gen.ts
@@ -1215,10 +1215,6 @@ export const $ConfigResponse = {
type: "string",
title: "Audit View Included Events",
},
- is_k8s: {
- type: "boolean",
- title: "Is K8S",
- },
test_connection: {
type: "string",
title: "Test Connection",
@@ -1247,7 +1243,6 @@ export const $ConfigResponse = {
"warn_deployment_exposure",
"audit_view_excluded_events",
"audit_view_included_events",
- "is_k8s",
"test_connection",
"state_color_mapping",
],
diff --git a/airflow/ui/openapi-gen/requests/types.gen.ts
b/airflow/ui/openapi-gen/requests/types.gen.ts
index a102621915b..724b6d58410 100644
--- a/airflow/ui/openapi-gen/requests/types.gen.ts
+++ b/airflow/ui/openapi-gen/requests/types.gen.ts
@@ -411,7 +411,6 @@ export type ConfigResponse = {
warn_deployment_exposure: boolean;
audit_view_excluded_events: string;
audit_view_included_events: string;
- is_k8s: boolean;
test_connection: string;
state_color_mapping: {
[key: string]: unknown;
diff --git a/airflow/ui/src/mocks/handlers/config.ts
b/airflow/ui/src/mocks/handlers/config.ts
index f962a04001b..39599f4a103 100644
--- a/airflow/ui/src/mocks/handlers/config.ts
+++ b/airflow/ui/src/mocks/handlers/config.ts
@@ -30,7 +30,6 @@ export const handlers: Array<HttpHandler> = [
hide_paused_dags_by_default: false,
instance_name: "Airflow",
instance_name_has_markup: false,
- is_k8s: false,
navbar_color: "#fff",
navbar_hover_color: "#eee",
navbar_logo_text_color: "#51504f",
diff --git a/tests/api_fastapi/core_api/routes/ui/test_config.py
b/tests/api_fastapi/core_api/routes/ui/test_config.py
index b50e40de2c4..a25c0909645 100644
--- a/tests/api_fastapi/core_api/routes/ui/test_config.py
+++ b/tests/api_fastapi/core_api/routes/ui/test_config.py
@@ -40,7 +40,6 @@ mock_config_response = {
"warn_deployment_exposure": False,
"audit_view_excluded_events": "",
"audit_view_included_events": "",
- "is_k8s": False,
"test_connection": "Disabled",
"state_color_mapping": {
"deferred": "mediumpurple",
