Skip to content

[ci_gen_kustomize_values] Use ctlplane_ocp_nad ranges for LB and NAD #3549

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

Merged
eduolivares merged 1 commit into from
Dec 16, 2025
Merged

[ci_gen_kustomize_values] Use ctlplane_ocp_nad ranges for LB and NAD #3549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 17 additions & 21 deletions roles/ci_gen_kustomize_values/templates/bgp-l3-xl/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data:
},
recursive=true) %}
{{ network.network_name }}_ip: {{ network.ip_v4 }}
{% if 'worker-9' == hostname and 'ctlplane' == network.network_name %}
{% if 'ctlplane' == network.network_name %}
base_if: {{ network.interface_name }}
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -50,6 +50,7 @@ data:
{% endfor %}

{% for network in cifmw_networking_env_definition.networks.values() %}
{% if network.network_name != 'ctlplane_ocp_nad' %}
{% set ns.lb_tools = {} %}
{{ network.network_name }}:
dnsDomain: {{ network.search_domain }}
Expand Down Expand Up @@ -95,7 +96,8 @@ data:
{% if ns.lb_tools | length > 0 %}
lb_addresses:
{% for tool in ns.lb_tools.keys() %}
{% for lb_range in network.tools[tool].ipv4_ranges %}
{% set lb_range_network = network if network.network_name != "ctlplane" else cifmw_networking_env_definition.networks.ctlplane_ocp_nad %}
{% for lb_range in lb_range_network.tools[tool].ipv4_ranges %}
- {{ lb_range.start }}-{{ lb_range.end }}
{% set _ = ns.lb_tools[tool].append(lb_range.start) %}
{% endfor %}
Expand All @@ -114,10 +116,10 @@ data:
iface: {{ network.network_name }}
base_iface: {{ ns.interfaces[network.network_name] }}
{% endif %}
{% else %}
{% if ns.interfaces[network.network_name] is defined %}
{% elif network.network_name == "ctlplane" %}
iface: {{ ns.interfaces[network.network_name] }}
{% endif %}
{% elif ns.interfaces[network.network_name] is defined %}
iface: {{ network.network_name }}
{% endif %}
{% if network.tools.multus is defined %}
net-attach-def: |
Expand All @@ -139,42 +141,36 @@ data:
{% endif %}
"ipam": {
"type": "whereabouts",
"range": "{{ network.network_v4 }}",
{% if network.network_name == "octavia" and network.tools.multus.ipv4_routes | default([]) | length > 0 %}
"routes": [
{% for route in network.tools.multus.ipv4_routes %}
{% for route in network.tools.multus.ipv4_routes %}
{
"dst": "{{ route.destination }}",
"gw": "{{ route.gateway }}"
}{% if not loop.last %},{% endif %}
{% endfor %}
{% endfor %}
],
{% endif %}
"range_start": "{{ network.tools.multus.ipv4_ranges.0.start }}",
"range_end": "{{ network.tools.multus.ipv4_ranges.0.end }}",
{% if network.network_name == "ctlplane" %}
"gateway": "{{ network.network_v4 |ansible.utils.nthhost(2) }}"
{% else %}
"gateway": "{{ network.network_v4 |ansible.utils.nthhost(1) }}"
{% endif %}
{% set range_network = network if network.network_name != "ctlplane" else cifmw_networking_env_definition.networks.ctlplane_ocp_nad %}
"range": "{{ range_network.network_v4 }}",
"range_start": "{{ range_network.tools.multus.ipv4_ranges.0.start }}",
"range_end": "{{ range_network.tools.multus.ipv4_ranges.0.end }}",
"gateway": "{{ range_network.network_v4 |ansible.utils.nthhost(1) }}"
}
}
{% endif %}
{% endif %}
{% endfor %}

dns-resolver:
config:
server:
# We set ctlplane = 192.168.125.0/24 and we rely on this definition to create the nad above.
# BGP exposes nad ips by advertising a 192.168.125.X address on the worker, and this would break dns
# because the traffic will not be sent to the right nic if a local ip on the same network is present.
# To avoid messing with routes etc we hardcode the 122.1 ip here
- 192.168.122.1
- "{{ cifmw_networking_env_definition.networks.ctlplane.gw_v4 }}"
search: []
options:
- key: server
values:
- 192.168.122.1
- {{ cifmw_networking_env_definition.networks.ctlplane.gw_v4 }}
{% for nameserver in cifmw_ci_gen_kustomize_values_nameservers %}
- key: server
values:
Expand Down
26 changes: 15 additions & 11 deletions roles/ci_gen_kustomize_values/templates/bgp_dt01/network-values/values.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ data:
},
recursive=true) %}
{{ network.network_name }}_ip: {{ network.ip_v4 }}
{% if 'worker-3' == hostname and 'ctlplane' == network.network_name %}
{% if 'ctlplane' == network.network_name %}
base_if: {{ network.interface_name }}
{% endif %}
{% endfor %}
Expand Down Expand Up @@ -56,6 +56,7 @@ data:
{% endfor %}

{% for network in cifmw_networking_env_definition.networks.values() %}
{% if network.network_name != 'ctlplane_ocp_nad' %}
{% set ns.lb_tools = {} %}
{{ network.network_name }}:
dnsDomain: {{ network.search_domain }}
Expand Down Expand Up @@ -101,7 +102,8 @@ data:
{% if ns.lb_tools | length > 0 %}
lb_addresses:
{% for tool in ns.lb_tools.keys() %}
{% for lb_range in network.tools[tool].ipv4_ranges %}
{% set lb_range_network = network if network.network_name != "ctlplane" else cifmw_networking_env_definition.networks.ctlplane_ocp_nad %}
{% for lb_range in lb_range_network.tools[tool].ipv4_ranges %}
- {{ lb_range.start }}-{{ lb_range.end }}
{% set _ = ns.lb_tools[tool].append(lb_range.start) %}
{% endfor %}
Expand All @@ -120,10 +122,10 @@ data:
iface: {{ network.network_name }}
base_iface: {{ ns.interfaces[network.network_name] }}
{% endif %}
{% else %}
{% if ns.interfaces[network.network_name] is defined %}
{% elif network.network_name == "ctlplane" %}
iface: {{ ns.interfaces[network.network_name] }}
{% elif ns.interfaces[network.network_name] is defined %}
iface: {{ network.network_name }}
{% endif %}
{% endif %}
{% if network.tools.multus is defined %}
net-attach-def: |
Expand All @@ -147,23 +149,25 @@ data:
{% endif %}
"ipam": {
"type": "whereabouts",
"range": "{{ network.network_v4 }}",
{% if network.network_name == "octavia" and network.tools.multus.ipv4_routes | default([]) | length > 0 %}
"routes": [
{% for route in network.tools.multus.ipv4_routes %}
{% for route in network.tools.multus.ipv4_routes %}
{
"dst": "{{ route.destination }}",
"gw": "{{ route.gateway }}"
}{% if not loop.last %},{% endif %}
{% endfor %}
{% endfor %}
],
{% endif %}
"range_start": "{{ network.tools.multus.ipv4_ranges.0.start }}",
"range_end": "{{ network.tools.multus.ipv4_ranges.0.end }}",
"gateway": "{{ network.network_v4 |ansible.utils.nthhost(1) }}"
{% set range_network = network if network.network_name != "ctlplane" else cifmw_networking_env_definition.networks.ctlplane_ocp_nad %}
"range": "{{ range_network.network_v4 }}",
"range_start": "{{ range_network.tools.multus.ipv4_ranges.0.start }}",
"range_end": "{{ range_network.tools.multus.ipv4_ranges.0.end }}",
"gateway": "{{ range_network.network_v4 |ansible.utils.nthhost(1) }}"
}
}
{% endif %}
{% endif %}
{% endfor %}

dns-resolver:
Expand Down
24 changes: 21 additions & 3 deletions scenarios/reproducers/bgp-l3-xl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ cifmw_networking_definition:
network: "192.168.125.0/24"
gateway: "192.168.125.1"
dns:
- "192.168.122.1"
- "192.168.125.1"
mtu: 1500
tools:
multus:
Expand All @@ -848,6 +848,22 @@ cifmw_networking_definition:
- start: 150
end: 200

ctlplane_ocp_nad:
network: "192.168.126.0/24"
gateway: "192.168.126.1"
dns:
- "192.168.126.1"
mtu: 1500
tools:
multus:
ranges:
- start: 30
end: 70
metallb:
ranges:
- start: 80
end: 90

ctlplaner0:
network: "192.168.122.0/24"
gateway: "192.168.122.1"
Expand Down Expand Up @@ -1077,13 +1093,15 @@ cifmw_networking_definition:
range:
start: 10
length: 10
networks: {}
networks:
ctlplane: {}
ocp_workers:
network-template:
range:
start: 20
length: 10
networks: {}
networks:
ctlplane: {}

instances:
controller-0:
Expand Down
Loading