Skip to content

fix(k8s): run launcher run_k8s_config takes precedence over user depl… #33957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sohamwaghe wants to merge 2 commits into
base: master
Choose a base branch
from
+105 −9
Open

fix(k8s): run launcher run_k8s_config takes precedence over user depl… #33957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4a7bd
fix(k8s): run launcher run_k8s_config takes precedence over user depl…
sohamwaghe Jun 25, 2026
44fc9e9
test(k8s): add coverage for include_run_tags=True path
sohamwaghe Jun 25, 2026
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
13 changes: 4 additions & 9 deletions python_modules/libraries/dagster-k8s/dagster_k8s/container_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ def _dedupe_list(values):
return new_list


# Lists that don't make sense to append when they're set from two different raw k8s configs,
# even if deep-merging
ALWAYS_SHALLOW_MERGE_LIST_FIELDS = {
"command",
"args",
Expand Down Expand Up @@ -107,7 +105,7 @@ def __new__(
)

run_k8s_config = K8sContainerContext._merge_k8s_config(
top_level_k8s_config._replace( # remove k8s service/deployment fields
top_level_k8s_config._replace(
deployment_metadata={},
service_metadata={},
service_spec_config={},
Expand All @@ -116,7 +114,7 @@ def __new__(
)

server_k8s_config = K8sContainerContext._merge_k8s_config(
top_level_k8s_config._replace( # remove k8s job fields
top_level_k8s_config._replace(
job_config={},
job_metadata={},
job_spec_config={},
Expand Down Expand Up @@ -218,7 +216,6 @@ def _merge_k8s_config(
onto_config: UserDefinedDagsterK8sConfig,
from_config: UserDefinedDagsterK8sConfig,
) -> UserDefinedDagsterK8sConfig:
# Keys are always the same and initialized in constructor
merge_behavior = from_config.merge_behavior
onto_dict = onto_config.to_dict()
from_dict = from_config.to_dict()
Expand Down Expand Up @@ -267,8 +264,7 @@ def merge(
self,
other: "K8sContainerContext",
) -> "K8sContainerContext":
# Lists of attributes that can be combined are combined, scalar values are replaced
# prefering the passed in container context

return K8sContainerContext(
server_k8s_config=self._merge_k8s_config(
self.server_k8s_config, other.server_k8s_config
Expand Down Expand Up @@ -500,7 +496,6 @@ def create_for_run(
K8sContainerContext(run_k8s_config=user_defined_k8s_config)
)

# If there's an allowlist, make sure user_defined_container_context doesn't violate it
if run_launcher:
user_defined_container_context = (
user_defined_container_context.validate_user_k8s_config_for_run(
Expand All @@ -509,7 +504,7 @@ def create_for_run(
)
)

return context.merge(user_defined_container_context)
return user_defined_container_context.merge(context)

@staticmethod
def create_from_config(run_container_context) -> "K8sContainerContext":
Expand Down
101 changes: 101 additions & 0 deletions python_modules/libraries/dagster-k8s/dagster_k8s_tests/unit_tests/test_container_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import pytest
from dagster._core.code_pointer import ModuleCodePointer
from dagster._core.errors import DagsterInvalidConfigError
from dagster._core.origin import JobPythonOrigin, RepositoryPythonOrigin
from dagster._core.storage.dagster_run import DagsterRun
from dagster_k8s import K8sRunLauncher
from dagster_k8s.container_context import K8sConfigMergeBehavior, K8sContainerContext
from dagster_k8s.job import (
DagsterK8sJobConfig,
Expand Down Expand Up @@ -871,3 +875,100 @@ def test_env_var_precedence():
{"name": "FOO", "value": "outercontainerconfig", "value_from": None},
{"name": "FOO", "value": "innerenvvars", "value_from": None},
]


def _run_with_container_context(container_context: dict) -> DagsterRun:
repo_origin = RepositoryPythonOrigin(
executable_path="/usr/bin/python",
code_pointer=ModuleCodePointer("fake_module", "fake_repo"),
container_context=container_context,
)
job_origin = JobPythonOrigin(job_name="fake_job", repository_origin=repo_origin)
return DagsterRun(job_name="fake_job", job_code_origin=job_origin)


def test_launcher_run_k8s_config_takes_precedence_over_container_context(
kubeconfig_file,
):
launcher = K8sRunLauncher(
service_account_name="webserver-admin",
instance_config_map="dagster-instance",
dagster_home="/opt/dagster/dagster_home",
job_image="fake_job_image",
load_incluster_config=False,
kubeconfig_file=kubeconfig_file,
run_k8s_config={"pod_spec_config": {"node_selector": {"pool": "autoscaling-pool"}}},
)

run = _run_with_container_context(
{
"k8s": {
"run_k8s_config": {"pod_spec_config": {"node_selector": {"pool": "default-pool"}}}
}
}
)

result = K8sContainerContext.create_for_run(run, launcher, include_run_tags=False)

node_selector = result.run_k8s_config.pod_spec_config.get("node_selector")
assert node_selector == {"pool": "autoscaling-pool"}


def test_launcher_run_k8s_config_precedence_preserves_non_conflicting_fields(
kubeconfig_file,
):
launcher = K8sRunLauncher(
service_account_name="webserver-admin",
instance_config_map="dagster-instance",
dagster_home="/opt/dagster/dagster_home",
job_image="fake_job_image",
load_incluster_config=False,
kubeconfig_file=kubeconfig_file,
run_k8s_config={"pod_spec_config": {"node_selector": {"pool": "autoscaling-pool"}}},
)

run = _run_with_container_context(
{
"k8s": {
"run_k8s_config": {
"pod_spec_config": {
"node_selector": {"pool": "default-pool"},
"dns_policy": "ClusterFirst",
}
}
}
}
)

result = K8sContainerContext.create_for_run(run, launcher, include_run_tags=False)

pod_spec = result.run_k8s_config.pod_spec_config
assert pod_spec.get("node_selector") == {"pool": "autoscaling-pool"}
assert pod_spec.get("dns_policy") == "ClusterFirst"
Comment on lines +890 to +947

@greptile-apps greptile-apps Bot Jun 25, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Missing coverage for include_run_tags=True path

Both new tests call create_for_run(..., include_run_tags=False). When include_run_tags=True, run tags are also merged into user_defined_container_context before the final merge with context (the launcher). A tag-defined pod_spec_config.node_selector is on the same side as the container-context-defined one, so the fix applies equally — but a test that exercises this path would make the invariant explicit and guard against a future regression where the tag-merge step is accidentally reordered after the launcher merge.



def test_launcher_run_k8s_config_takes_precedence_with_run_tags(
kubeconfig_file,
):
launcher = K8sRunLauncher(
service_account_name="webserver-admin",
instance_config_map="dagster-instance",
dagster_home="/opt/dagster/dagster_home",
job_image="fake_job_image",
load_incluster_config=False,
kubeconfig_file=kubeconfig_file,
run_k8s_config={"pod_spec_config": {"node_selector": {"pool": "autoscaling-pool"}}},
)

run = _run_with_container_context(
{
"k8s": {
"run_k8s_config": {"pod_spec_config": {"node_selector": {"pool": "default-pool"}}}
}
}
)

result = K8sContainerContext.create_for_run(run, launcher, include_run_tags=True)

node_selector = result.run_k8s_config.pod_spec_config.get("node_selector")
assert node_selector == {"pool": "autoscaling-pool"}