Skip to content

Commit 54694b5

Browse files
committed
Fix backcompat
1 parent 847404a commit 54694b5

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

Diff for: providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/cli/kubernetes_command.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@
4343
def generate_pod_yaml(args):
4444
"""Generate yaml files for each task in the DAG. Used for testing output of KubernetesExecutor."""
4545
logical_date = args.logical_date if AIRFLOW_V_3_0_PLUS else args.execution_date
46-
dag = get_dag(bundle_names=args.bundle_name, dag_id=args.dag_id)
46+
if AIRFLOW_V_3_0_PLUS:
47+
dag = get_dag(bundle_names=args.bundle_name, dag_id=args.dag_id)
48+
else:
49+
dag = get_dag(subdir=args.subdir, dag_id=args.dag_id)
4750
yaml_output_path = args.output_path
4851
if AIRFLOW_V_3_0_PLUS:
4952
dr = DagRun(dag.dag_id, logical_date=logical_date)

Diff for: providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
ARG_EXECUTION_DATE as ARG_LOGICAL_DATE,
5151
)
5252
from airflow.cli.cli_config import (
53-
ARG_BUNDLE_NAME,
5453
ARG_DAG_ID,
5554
ARG_OUTPUT_PATH,
5655
ARG_VERBOSE,
@@ -94,6 +93,16 @@
9493
AirflowKubernetesScheduler,
9594
)
9695

96+
97+
if AIRFLOW_V_3_0_PLUS:
98+
from airflow.cli.cli_config import ARG_BUNDLE_NAME
99+
100+
ARG_COMPAT = ARG_BUNDLE_NAME
101+
else:
102+
from airflow.cli.cli_config import ARG_SUBDIR # type: ignore[attr-defined]
103+
104+
ARG_COMPAT = ARG_SUBDIR
105+
97106
# CLI Args
98107
ARG_NAMESPACE = Arg(
99108
("--namespace",),
@@ -128,7 +137,7 @@
128137
help="Generate YAML files for all tasks in DAG. Useful for debugging tasks without "
129138
"launching into a cluster",
130139
func=lazy_load_command("airflow.providers.cncf.kubernetes.cli.kubernetes_command.generate_pod_yaml"),
131-
args=(ARG_DAG_ID, ARG_LOGICAL_DATE, ARG_BUNDLE_NAME, ARG_OUTPUT_PATH, ARG_VERBOSE),
140+
args=(ARG_DAG_ID, ARG_LOGICAL_DATE, ARG_COMPAT, ARG_OUTPUT_PATH, ARG_VERBOSE),
132141
),
133142
)
134143

0 commit comments

Comments
 (0)