Merge e210fc21b6 into 11f9505460

roles/k3s_server/defaults/main.yml

@@ -16,9 +16,6 @@ kube_vip_bgp_as: "64513"
 kube_vip_bgp_peeraddress: 192.168.30.1
 kube_vip_bgp_peeras: "64512"
 
-kube_vip_bgp_peers: []
-kube_vip_bgp_peers_groups: ['k3s_master']
-
 metal_lb_controller_tag_version: v0.14.3
 metal_lb_speaker_tag_version: v0.14.3
 metal_lb_type: native

roles/k3s_server/meta/main.yml

@@ -62,14 +62,6 @@ argument_specs:
         description: Defines the AS for the kube-vip BGP peer
         default: "64512"
 
-      kube_vip_bgp_peers:
-        description: List of BGP peer ASN & address pairs
-        default: []
-
-      kube_vip_bgp_peers_groups:
-        description: Inventory group in which to search for additional kube_vip_bgp_peers parameters to merge.
-        default: ['k3s_master']
-
       kube_vip_iface:
         description:
           - Explicitly define an interface that ALL control nodes

roles/k3s_server/tasks/vip.yml

@@ -1,8 +1,4 @@
 ---
-- name: Set _kube_vip_bgp_peers fact
-  ansible.builtin.set_fact:
-    _kube_vip_bgp_peers: "{{ lookup('community.general.merge_variables', '^kube_vip_bgp_peers__.+$', initial_value=kube_vip_bgp_peers, groups=kube_vip_bgp_peers_groups) }}"  # yamllint disable-line rule:line-length
-
 - name: Create manifests directory on first master
   ansible.builtin.file:
     path: /var/lib/rancher/k3s/server/manifests

roles/k3s_server/templates/vip.yaml.j2

@@ -61,10 +61,6 @@ spec:
         - name: bgp_routerid
           value: "{{ kube_vip_bgp_routerid }}"
 {% endif %}
-{% if _kube_vip_bgp_peers | length > 0 %}
-        - name: bgppeers
-          value: "{{ _kube_vip_bgp_peers | map(attribute='peer_address') | zip(_kube_vip_bgp_peers| map(attribute='peer_asn')) | map('join', ',') | join(':') }}"  # yamllint disable-line rule:line-length
-{% else %}
 {% if kube_vip_bgp_as is defined %}
         - name: bgp_as
           value: "{{ kube_vip_bgp_as }}"
@@ -77,7 +73,6 @@ spec:
         - name: bgp_peeras
           value: "{{ kube_vip_bgp_peeras }}"
 {% endif %}
-{% endif %}
 {% endif %}
         image: ghcr.io/kube-vip/kube-vip:{{ kube_vip_tag_version }}
         imagePullPolicy: Always