Update docs

docs/metallb.md

@@ -19,9 +19,6 @@ You have to explicitly enable the MetalLB extension.
 ```yaml
 metallb_enabled: true
 metallb_speaker_enabled: true
-metallb_avoid_buggy_ips: true
-metallb_ip_range:
-  - 10.5.0.0/16
 ```
 
 By default only the MetalLB BGP speaker is allowed to run on control plane nodes. If you have a single node cluster or a cluster where control plane are also worker nodes you may need to enable tolerations for the MetalLB controller:
@@ -86,7 +83,6 @@ metallb_config:
 
       peer_port: 179 # The TCP port to talk to. Defaults to 179, you shouldn't need to set this in production.
       hold_time: 120s # Requested BGP hold time, per RFC4271.
-      keepalive_time: 120s # Requested BGP keepalive time, per RFC4271.
 
     communities:
       vpn-only: "1234:1"
@@ -103,8 +99,8 @@ metallb_config:
           address_pool:
             - pool1
 
-          # (optional) The source IP address to use when establishing the BGP session. In most cases the source-address field should only be used with per-node peers, i.e. peers with node selectors which select only one node. CURRENTLY NOT SUPPORTED BY US (ACC ICT)
-          source_address: 172.18.113.161
+          # (optional) The source IP address to use when establishing the BGP session. In most cases the source-address field should only be used with per-node peers, i.e. peers with node selectors which select only one node. CURRENTLY NOT SUPPORTED
+          source_address: 192.0.2.2
 
           # (optional) The router ID to use when connecting to this peer. Defaults to the node IP address.
           # Generally only useful when you need to peer with another BGP router running on the same machine as MetalLB.
@@ -122,8 +118,8 @@ metallb_config:
           address_pool:
             - pool2
 
-          # (optional) The source IP address to use when establishing the BGP session. In most cases the source-address field should only be used with per-node peers, i.e. peers with node selectors which select only one node. CURRENTLY NOT SUPPORTED BY US (ACC ICT)
-          source_address: 172.18.113.162
+          # (optional) The source IP address to use when establishing the BGP session. In most cases the source-address field should only be used with per-node peers, i.e. peers with node selectors which select only one node. CURRENTLY NOT SUPPORTED
+          source_address: 192.0.2.1
 
           # (optional) The router ID to use when connecting to this peer. Defaults to the node IP address.
           # Generally only useful when you need to peer with another BGP router running on the same machine as MetalLB.
@@ -140,30 +136,61 @@ In this scenario you should disable the MetalLB speaker and configure the `calic
 ```yaml
 metallb_speaker_enabled: false
 metallb_avoid_buggy_ips: true
-metallb_ip_range:
+metallb_config:
+  address_pools:
+    primary:
+      ip_range:
         - 10.5.0.0/16
-calico_advertise_service_loadbalancer_ips: "{{ metallb_ip_range }}"
+      auto_assign: true
+  layer2:
+    - primary
+calico_advertise_service_loadbalancer_ips: "{{ metallb_config.address_pools.primary.ip_range }}"
 ```
 
-If you have additional loadbalancer IP pool in `metallb_additional_address_pools` , ensure to add them to the list.
+If you have additional loadbalancer IP pool in `metallb_config.address_pools` , ensure to add them to the list.
 
 ```yaml
 metallb_speaker_enabled: false
-metallb_ip_range:
+metallb_config:
+  address_pools:
+    primary:
+      ip_range:
         - 10.5.0.0/16
-metallb_additional_address_pools:
-  kube_service_pool_1:
+      auto_assign: true
+    pool1:
       ip_range:
         - 10.6.0.0/16
-    protocol: "bgp"
-    auto_assign: false
-    avoid_buggy_ips: true
-  kube_service_pool_2:
+      auto_assign: true
+    pool2:
       ip_range:
         - 10.10.0.0/16
-    protocol: "bgp"
-    auto_assign: false
-    avoid_buggy_ips: true
+      auto_assign: true
+  layer2:
+    - primary
+  layer3:
+    defaults:
+      peer_port: 179
+      hold_time: 120s 
+    communities:
+      vpn-only: "1234:1"
+      NO_ADVERTISE: "65535:65282"
+    metallb_peers:
+        peer1:
+          peer_address: 10.6.0.1
+          peer_asn: 64512
+          my_asn: 4200000000
+          communities:
+            - vpn-only
+          address_pool:
+            - pool1
+        peer2:
+          peer_address: 10.10.0.1
+          peer_asn: 64513
+          my_asn: 4200000000
+          communities:
+            - NO_ADVERTISE
+          address_pool:
+            - pool2
 calico_advertise_service_loadbalancer_ips:
   - 10.5.0.0/16
   - 10.6.0.0/16