Merge 492339c324 into 03ae8de0d5

roles/k3s_server_post/defaults/main.yml

@@ -15,8 +15,6 @@ cilium_bgp: false
 cilium_exportPodCIDR: true  # noqa var-naming
 cilium_bgp_my_asn: 64513
 cilium_bgp_peer_asn: 64512
-cilium_bgp_neighbors: []
-cilium_bgp_neighbors_groups: ['k3s_all']
 cilium_bgp_lb_cidr: 192.168.31.0/24
 cilium_hubble: true
 cilium_mode: native

roles/k3s_server_post/meta/main.yml

@@ -66,14 +66,6 @@ argument_specs:
         description: BGP peer address
         default: ~
 
-      cilium_bgp_neighbors:
-        description: List of BGP peer ASN & address pairs
-        default: []
-
-      cilium_bgp_neighbors_groups:
-        description: Inventory group in which to search for additional cilium_bgp_neighbors parameters to merge.
-        default: ['k3s_all']
-
       cilium_bgp_lb_cidr:
         description: BGP load balancer IP range
         default: 192.168.31.0/24

roles/k3s_server_post/tasks/cilium.yml

@@ -221,11 +221,6 @@
     - name: Configure Cilium BGP
       when: cilium_bgp
       block:
-        - name: Set _cilium_bgp_neighbors fact
-          ansible.builtin.set_fact:
-            _cilium_bgp_neighbors: "{{ lookup('community.general.merge_variables', '^cilium_bgp_neighbors__.+$', initial_value=cilium_bgp_neighbors, groups=cilium_bgp_neighbors_groups) }}"  # yamllint disable-line rule:line-length
-          when: cilium_bgp_neighbors | length > 0
-
         - name: Copy BGP manifests to first master
           ansible.builtin.template:
             src: cilium.crs.j2

roles/k3s_server_post/templates/cilium.crs.j2

@@ -7,19 +7,6 @@ spec: # CiliumBGPPeeringPolicySpec
  - localASN: {{ cilium_bgp_my_asn }}
    exportPodCIDR: {{ cilium_exportPodCIDR | default('true') }}
    neighbors: # []CiliumBGPNeighbor
-{% if _cilium_bgp_neighbors | length > 0 %}
-{% for item in _cilium_bgp_neighbors %}
-    - peerAddress: '{{ item.peer_address + "/32"}}'
-      peerASN: {{ item.peer_asn }}
-      eBGPMultihopTTL: 10
-      connectRetryTimeSeconds: 120
-      holdTimeSeconds: 90
-      keepAliveTimeSeconds: 30
-      gracefulRestart:
-        enabled: true
-        restartTimeSeconds: 120
-{% endfor %}
-{% else %}
     - peerAddress: '{{ cilium_bgp_peer_address + "/32"}}'
       peerASN: {{ cilium_bgp_peer_asn }}
       eBGPMultihopTTL: 10
@@ -29,7 +16,6 @@ spec: # CiliumBGPPeeringPolicySpec
       gracefulRestart:
         enabled: true
         restartTimeSeconds: 120
-{% endif %}
    serviceSelector:
       matchExpressions:
          - {key: somekey, operator: NotIn, values: ['never-used-value']}