Merge branch 'master' into with-metal-lb-interface

roles/k3s_agent/meta/main.yml

@@ -19,14 +19,19 @@ argument_specs:
 
       proxy_env:
         type: dict
-        description: Internet proxy configurations
+        description:
+          - Internet proxy configurations.
+          - See https://docs.k3s.io/advanced#configuring-an-http-proxy for details
         default: ~
         options:
           HTTP_PROXY:
+            description: HTTP internet proxy
             required: true
           HTTPS_PROXY:
+            description: HTTPS internet proxy
             required: true
           NO_PROXY:
+            description: Addresses that will not use the proxies
             required: true
 
       systemd_dir:

roles/k3s_server/defaults/main.yml

@@ -16,6 +16,9 @@ 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,6 +62,14 @@ 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
@@ -95,17 +103,23 @@ argument_specs:
           - frr
           - native
         default: native
+        description: Use FRR mode or native. Valid values are `frr` and `native`
 
       proxy_env:
         type: dict
-        description: Internet proxy configurations
+        description:
+          - Internet proxy configurations.
+          - See https://docs.k3s.io/advanced#configuring-an-http-proxy for details
         default: ~
         options:
           HTTP_PROXY:
+            description: HTTP internet proxy
             required: true
           HTTPS_PROXY:
+            description: HTTPS internet proxy
             required: true
           NO_PROXY:
+            description: Addresses that will not use the proxies
             required: true
 
       retry_count:

roles/k3s_server/tasks/vip.yml

@@ -1,4 +1,8 @@
 ---
+- 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,6 +61,10 @@ 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 }}"
@@ -73,6 +77,7 @@ 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

roles/k3s_server_post/tasks/cilium.yml

@@ -224,7 +224,6 @@
         - 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:

roles/lxc/meta/main.yml

@@ -5,3 +5,4 @@ argument_specs:
     options:
       custom_reboot_command:
         default: ~
+        description: Command to run on reboot

roles/proxmox_lxc/meta/main.yml

@@ -0,0 +1,9 @@
+---
+argument_specs:
+  main:
+    short_description: Proxmox LXC settings
+    options:
+      proxmox_lxc_ct_ids:
+        description: Proxmox container ID list
+        type: list
+        required: true

roles/raspberrypi/meta/main.yml

@@ -0,0 +1,10 @@
+---
+argument_specs:
+  main:
+    short_description: Adjust some Raspberry Pi specific requisites
+    options:
+      state:
+        default: present
+        description:
+          - Indicates whether the k3s prerequisites for Raspberry Pi should be
+          - set up (possible values are `present` and `absent`)

roles/reset_proxmox_lxc/meta/main.yml

@@ -0,0 +1,9 @@
+---
+argument_specs:
+  main:
+    short_description: Proxmox LXC settings
+    options:
+      proxmox_lxc_ct_ids:
+        description: Proxmox container ID list
+        type: list
+        required: true