k3s: use cilium with BGP

Signed-off-by: Christian Berendt <[email protected]>
osism · Sep 25, 2024 · c73aeb3 · c73aeb3
1 parent 429f05c
commit c73aeb3
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 5 deletions.
diff --git a/environments/infrastructure/configuration.yml b/environments/infrastructure/configuration.yml
@@ -109,4 +109,8 @@ thanos_sidecar_prometheus_url: "https://api-int.testbed.osism.xyz:9091/"
 ##########################
 # k3s
 
-metal_lb_ip_range: "192.168.129.1-192.168.129.254"
+cilium_bgp: true
+cilium_bgp_my_asn: "64513"
+cilium_bgp_peer_asn: "64512"
+cilium_bgp_peer_address: "192.168.128.5"
+cilium_bgp_lb_cidr: "172.31.252.0/23"
diff --git a/inventory/20-roles b/inventory/20-roles
@@ -27,7 +27,6 @@ testbed-control-nodes
 testbed-resource-nodes
 
 [k3s_node:children]
-testbed-managers
 #testbed-resource-nodes
 
 # NOTE: After the initial import of the inventory in the netbox,

diff --git a/inventory/99-overwrite b/inventory/99-overwrite
@@ -9,3 +9,6 @@ ceph-resource
 
 [ceph-rgw:children]
 ceph-resource
+
+[frr:children]
+manager
diff --git a/inventory/group_vars/testbed-managers.yml b/inventory/group_vars/testbed-managers.yml
@@ -47,5 +47,18 @@ network_dispatcher_scripts:
 # kolla
 
 network_interface: "{{ ansible_local.testbed_network_devices.management }}"
+
+##########################################################
+# k3s
+
 k3s_interface: vxlan1
-flannel_iface: "{{ k3s_interface }}"
+cilium_iface: "{{ k3s_interface }}"
+
+##########################################################
+# frr
+
+frr_uplinks_groups:
+ k3s_all
+frr_local_as: 64512
+frr_loopback_v4: "192.168.128.{{ node_id }}"
+frr_type: k3s_cilium
diff --git a/inventory/group_vars/testbed-nodes.yml b/inventory/group_vars/testbed-nodes.yml
@@ -84,8 +84,6 @@ network_dispatcher_scripts:
 # kolla
 
 network_interface: "{{ ansible_local.testbed_network_devices.management }}"
-k3s_interface: vxlan1
-flannel_iface: "{{ k3s_interface }}"
 neutron_external_interface: vxlan0
 octavia_network_interface: ohm0
 
@@ -104,3 +102,14 @@ devices: "{{ ansible_local.testbed_ceph_devices }}"
 # NOTE: to use the third block device for Ceph change this parameter as follows
 # ceph_osd_devices: "{{ ansible_local.testbed_ceph_osd_devices_all }}"
 # devices: "{{ ansible_local.testbed_ceph_devices }}"
+
+##########################################################
+# k3s
+
+k3s_interface: vxlan1
+cilium_iface: "{{ k3s_interface }}"
+
+frr_uplinks__k3s_node:
+ - interface: vxlan1
+ address: "192.168.128.{{ node_id }}"
+ remote_as: 64513