[Config] Only override controller.consolidation_mode config for now

[kevinmingtarja]

This reverts parts of commit 40995a2.

This change skipped the ('jobs', 'controller') and ('serve', 'controller') from the client config override, which is the right thing to do. But as a result, our existing test_managed_jobs_ha_kill_* broke, because it's overriding the high_availability config from the client, not the server.

We should properly fix our test setup such that these configs can be applied on the server side. But in the meantime to unblock nightly, let's revert this change instead skip just the consolidation_mode config, instead of the whole controller config, so that HA config is still allowed to override.

Tested (run the relevant ones):

• Code formatting: install pre-commit (auto-check on commit) or bash format.sh
• Any manual or new tests for this PR (please specify below)
• All smoke tests: /smoke-test (CI) or pytest tests/test_smoke.py (local)
• Relevant individual tests: /smoke-test -k test_name (CI) or pytest tests/test_smoke.py::test_name (local)
• Backward compatibility: /quicktest-core (CI) or pytest tests/smoke_tests/test_backward_compat.py (local)

[kevinmingtarja]

/smoke-test --kubernetes --remote-server -k test_managed_jobs_ha_kill
/smoke-test --kubernetes --dependency -k test_managed_jobs_ha_kill
/smoke-test --kubernetes -k test_managed_jobs_ha_kill

[kevinmingtarja]

/quicktest-core

[cblmemo]

Thanks for catching this @kevinmingtarja ! Instead of reverting the whole commit, can we keep it, but only skip the consolidation mode config but not the HA one?

#7560 (comment)

Chris and I have a discussion on this. originally I only skip the consolidation mode config and it works well.

[kevinmingtarja]

Thanks for catching this @kevinmingtarja ! Instead of reverting the whole commit, can we keep it, but only skip the consolidation mode config but not the HA one?

#7560 (comment)

Chris and I have a discussion on this. originally I only skip the consolidation mode config and it works well.

Sounds good! Let's do that.

Added a TODO as well for the future.

[kevinmingtarja]

/smoke-test --kubernetes --remote-server -k test_managed_jobs_ha_kill
/smoke-test --kubernetes --dependency -k test_managed_jobs_ha_kill
/smoke-test --kubernetes -k test_managed_jobs_ha_kill

[kevinmingtarja]

/quicktest-core

[cblmemo]

Thanks for fixing this @kevinmingtarja ! LGTM.

[cblmemo]

Can we also include which test needs to be fixed in the comment?

[kevinmingtarja]

added