Skip to content

Commit d9d4f5d

Browse files
committed
border: serve only border_agent on the core node's agent
border_node is always pinned to a specific agent by the builder (SchedulableToAgentFromAgentUUIDMixin) and its driver ships where the data plane lives: the realm node image or the dedicated border VM image. Advertising it from the core agent risked an unpinned border_node being scheduled onto the core node (the scheduler takes the first capable agent), mirroring how paas_lb_node lives only in the lbaas VM image. Also add border_agent to the bootstrap [universal_agent_scheduler] rewrite, which fully replaces the section and silently dropped it.
1 parent 499f1ad commit d9d4f5d

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

etc/exordos_universal_agent/exordos_universal_agent.conf.j2

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ caps_drivers =
1818
CoreDNSCertificateCapabilityDriver,
1919
LBAgentCapabilityDriver,
2020
BorderAgentCapabilityDriver,
21-
BorderCapabilityDriver,
2221
GuestMachineCapabilityDriver,
2322
SSHKeyCapabilityDriver,
2423
RenderAgentDriver
@@ -31,8 +30,7 @@ capabilities =
3130
certificate,
3231
paas_lb_agent,
3332
repo_proxy_installed_element,
34-
border_agent,
35-
border_node
33+
border_agent
3634

3735

3836
[CoreDNSCertificateCapabilityDriver]

exordos_core/cmd/bootstrap.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,8 @@ def _migrate_installed_elements_configs() -> None:
415415
password,
416416
certificate,
417417
paas_lb_agent,
418-
repo_proxy_installed_element
418+
repo_proxy_installed_element,
419+
border_agent
419420
"""
420421
try:
421422
with open(UA_CONFIG_PATH, "r", encoding="utf-8") as f:

0 commit comments

Comments
 (0)