Fix K8S executor override config using pod_override_object

airflow/providers/cncf/kubernetes/pod_generator.py

@@ -434,8 +434,8 @@ def construct_pod(
         )
 
         # Reconcile the pods starting with the first chronologically,
-        # Pod from the pod_template_File -> Pod from executor_config arg -> Pod from the K8s executor
-        pod_list = [base_worker_pod, pod_override_object, dynamic_pod]
+        # Pod from the pod_template_File -> Pod from the K8s executor -> Pod from executor_config arg
+        pod_list = [base_worker_pod, dynamic_pod, pod_override_object]
 
         try:
             pod = reduce(PodGenerator.reconcile_pods, pod_list)

dev/breeze/src/airflow_breeze/commands/kubernetes_commands.py

@@ -167,6 +167,13 @@ def kubernetes_group():
     envvar="USE_STANDARD_NAMING",
 )
 
+option_multi_namespace_mode = click.option(
+    "--multi-namespace-mode",
+    help="Use multi namespace mode.",
+    is_flag=True,
+    envvar="MULTI_NAMESPACE_MODE",
+)
+
 option_rebuild_base_image = click.option(
     "--rebuild-base-image",
     help="Rebuilds base Airflow image before building K8S image.",
@@ -954,6 +961,7 @@ def _deploy_helm_chart(
     executor: str,
     use_standard_naming: bool,
     extra_options: tuple[str, ...] | None = None,
+    multi_namespace_mode: bool = False,
 ) -> RunCommandResult:
     cluster_name = get_kubectl_cluster_name(python=python, kubernetes_version=kubernetes_version)
     action = "Deploying" if not upgrade else "Upgrading"
@@ -994,6 +1002,8 @@ def _deploy_helm_chart(
             "config.logging.logging_level=DEBUG",
             "--set",
             f"executor={executor}",
+            "--set",
+            f"multiNamespaceMode={'true' if multi_namespace_mode else 'false'}",
         ]
         if upgrade:
             # force upgrade
@@ -1024,6 +1034,7 @@ def _deploy_airflow(
     wait_time_in_seconds: int,
     use_standard_naming: bool,
     extra_options: tuple[str, ...] | None = None,
+    multi_namespace_mode: bool = False,
 ) -> tuple[int, str]:
     action = "Deploying" if not upgrade else "Upgrading"
     cluster_name = get_kind_cluster_name(python=python, kubernetes_version=kubernetes_version)
@@ -1036,6 +1047,7 @@ def _deploy_airflow(
         executor=executor,
         use_standard_naming=use_standard_naming,
         extra_options=extra_options,
+        multi_namespace_mode=multi_namespace_mode,
     )
     if result.returncode == 0:
         get_console(output=output).print(
@@ -1073,6 +1085,7 @@ def _deploy_airflow(
 @option_debug_resources
 @option_include_success_outputs
 @option_use_standard_naming
+@option_multi_namespace_mode
 @option_python_versions
 @option_kubernetes_versions
 @option_verbose
@@ -1093,6 +1106,7 @@ def deploy_airflow(
     python_versions: str,
     kubernetes_versions: str,
     extra_options: tuple[str, ...],
+    multi_namespace_mode: bool = False,
 ):
     if run_in_parallel:
         python_version_array: list[str] = python_versions.split(" ")
@@ -1121,6 +1135,7 @@ def deploy_airflow(
                             "wait_time_in_seconds": wait_time_in_seconds,
                             "extra_options": extra_options,
                             "output": outputs[index],
+                            "multi_namespace_mode": multi_namespace_mode,
                         },
                     )
                     for index, combo in enumerate(combos)
@@ -1142,6 +1157,7 @@ def deploy_airflow(
             use_standard_naming=use_standard_naming,
             wait_time_in_seconds=wait_time_in_seconds,
             extra_options=extra_options,
+            multi_namespace_mode=multi_namespace_mode,
         )
         if return_code == 0:
             get_console().print(
@@ -1486,6 +1502,7 @@ def _run_complete_tests(
             use_standard_naming=use_standard_naming,
             wait_time_in_seconds=wait_time_in_seconds,
             extra_options=extra_options,
+            multi_namespace_mode=True,
         )
         if returncode != 0:
             _logs(python=python, kubernetes_version=kubernetes_version)
@@ -1516,6 +1533,7 @@ def _run_complete_tests(
                 use_standard_naming=use_standard_naming,
                 wait_time_in_seconds=wait_time_in_seconds,
                 extra_options=extra_options,
+                multi_namespace_mode=True,
             )
             if returncode != 0:
                 _logs(python=python, kubernetes_version=kubernetes_version)

dev/breeze/src/airflow_breeze/commands/kubernetes_commands_config.py

@@ -160,6 +160,7 @@
                 "--upgrade",
                 "--wait-time-in-seconds",
                 "--use-standard-naming",
+                "--multi-namespace-mode",
             ],
         },
         {

images/breeze/output-commands-hash.txt

@@ -22,7 +22,7 @@ k8s:build-k8s-image:b625255c3e8f3f794ee404f9a4476836
 k8s:configure-cluster:727d3d25b67fc02d8f9b45fd30981911
 k8s:create-cluster:9428fa86c41f868db80bda7c232cead1
 k8s:delete-cluster:12aed4c701000ae5ebe264efcdcd1e5a
-k8s:deploy-airflow:a24b39835acf66263e561ce5eaee332c
+k8s:deploy-airflow:c17477e1e08326ef5ff1bd15f4047efe
 k8s:k9s:26504ebfc24f3599bbda4e4110c80fd0
 k8s:logs:a1eb1d8046bbc542fd210c00ceb23ee9
 k8s:run-complete-tests:6ad037e6986aa7ae136028f4a7640e91
@@ -31,7 +31,7 @@ k8s:shell:cb7b8f22ce35f94cce5b0ca0c64bfbb3
 k8s:status:0a472b05c23aa70098241414ac86687f
 k8s:tests:b981dbbfbfe531e358ebb2aaa0739525
 k8s:upload-k8s-image:8ae1ad3745e2f34a142ecff8a714af1d
-k8s:e23599728fd67b64e756e6dbe7f256f0
+k8s:c4986a0151e13ef91218ac2071585270
 prod-image:build:20f84ddadc2fe4ae2723b7ccdde0197f
 prod-image:pull:3817ef211b023b76df84ee1110ef64dd
 prod-image:verify:bd2b78738a7c388dbad6076c41a9f906