Merge pull request #85011 from xenolinux/metallb-correction

OCPBUGS#44365: Hosted control planes: Configure layer2 and BGP using metallb

Author: xenolinux

modules/hcp-bm-ingress.adoc

@@ -75,47 +75,55 @@ metadata:
 $ oc apply -f metallb-instance-config.yaml
 ----
 
-. Configure the MetalLB Operator by creating two resources:
-+
-** An `IPAddressPool` resource with a single IP address. This IP address must be on the same subnet as the network that the cluster nodes use.
-** A `BGPAdvertisement` resource to advertise the load balancer IP addresses that the `IPAddressPool` resource provides through the BGP protocol.
-+
-.. Create a YAML file to contain the configuration:
+. Create an `IPAddressPool` resource with a single IP address. This IP address must be on the same subnet as the network that the cluster nodes use.
+
+.. Create a file, such as `ipaddresspool.yaml`, with content like the following example:
 +
 [source,yaml]
 ----
 apiVersion: metallb.io/v1beta1
 kind: IPAddressPool
 metadata:
-  name: <ip_address_pool_name> <1>
   namespace: metallb
+  name: <ip_address_pool_name> <1>
 spec:
-  protocol: layer2
-  autoAssign: false
   addresses:
     - <ingress_ip>-<ingress_ip> <2>
----
+  autoAssign: false
+----
+<1> Specify the `IPAddressPool` resource name.
+<2> Specify the IP address for your environment. For example, `192.168.122.23`.
+
+.. Apply the configuration for the IP address pool by entering the following command:
++
+[source,terminal]
+----
+$ oc apply -f ipaddresspool.yaml
+----
+
+. Create a L2 advertisement.
+
+.. Create a file, such as `l2advertisement.yaml`, with content like the following example:
++
+[source,yaml]
+----
 apiVersion: metallb.io/v1beta1
-kind: BGPAdvertisement
+kind: L2Advertisement
 metadata:
-  name: <bgp_advertisement_name> <3>
+  name: <l2_advertisement_name> <1>
   namespace: metallb
 spec:
   ipAddressPools:
-    - <ip_address_pool_name> <1>
+   - <ip_address_pool_name> <2>
 ----
-+
-<1> Specify the `IPAddressPool` resource name.
-<2> Specify the IP address for your environment, for example, `192.168.122.23`.
-<3> Specify the `BGPAdvertisement` resource name.
-+
-.. Save the file as `ipaddresspool-bgpadvertisement-config.yaml`.
-+
-.. Create the resources by entering the following command:
+<1> Specify the `L2Advertisement` resource name.
+<2> Specify the `IPAddressPool` resource name.
+
+.. Apply the configuration by entering the following command:
 +
 [source,terminal]
 ----
-$ oc apply -f ipaddresspool-bgpadvertisement-config.yaml
+$ oc apply -f l2advertisement.yaml
 ----
 
 . After creating a service of the `LoadBalancer` type, MetalLB adds an external IP address for the service.

modules/hcp-metallb.adoc

@@ -90,4 +90,4 @@ $ oc apply -f l2advertisement.yaml
 [source,terminal]
 ----
 l2advertisement.metallb.io/metallb created
-----
+----