Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion airflow/api_fastapi/core_api/datamodels/ui/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 0 additions & 4 deletions airflow/api_fastapi/core_api/openapi/v1-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7993,9 +7993,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
Expand All @@ -8021,7 +8018,6 @@ components:
- warn_deployment_exposure
- audit_view_excluded_events
- audit_view_included_events
- is_k8s
- test_connection
- state_color_mapping
title: ConfigResponse
Expand Down
3 changes: 1 addition & 2 deletions airflow/api_fastapi/core_api/routes/ui/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
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"])

Expand Down Expand Up @@ -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()})
Expand Down
4 changes: 0 additions & 4 deletions airflow/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
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
Expand Down Expand Up @@ -680,9 +679,6 @@ def initialize():
# 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", ""))
Expand Down
5 changes: 0 additions & 5 deletions airflow/ui/openapi-gen/requests/schemas.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
],
Expand Down
1 change: 0 additions & 1 deletion airflow/ui/openapi-gen/requests/types.gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion airflow/ui/src/mocks/handlers/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion tests/api_fastapi/core_api/routes/ui/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"warn_deployment_exposure": False,
"audit_view_excluded_events": "",
"audit_view_included_events": "",
"is_k8s": False,
"test_connection": "Disabled",
"state_color_mapping": {
"deferred": "mediumpurple",
Expand Down