Skip to content

Commit efa8195

Browse files
committed
Checkpoint
1 parent b55be1c commit efa8195

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

modules/nw-bgp-about.adoc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,11 @@ Use of BGP routing requires that you have properly configured BGP for your netwo
3434

3535
The MetalLB Operator is installed as an add-on to the cluster. Deployment of the MetalLB Operator automatically enables FRR-K8s as an additional routing capability provider and uses the FRR-K8s daemon installed by this feature.
3636

37+
Before upgrading to 4.18, any existing FRRConfiguration in the metallb-system namespace not managed by the MetalLB operator (added by a cluster administrator or any other component) needs to be copied to the openshift-frr-k8s namespace manually, creating the namespace if necessary.
38+
3739
[IMPORTANT]
3840
====
39-
If you are using the MetalLB Operator, you must manually copy any existing `FRRConfiguration` CRs in the `metallb-system` namespace to the `openshift-frr-k8s` namespace. This includes `FRRConfiguration` CRs created by both cluster administrators and by cluster components.
41+
If you are using the MetalLB Operator prior to upgrading to {product-title} 4.18, you must manually copy any existing `FRRConfiguration` CRs in the `metallb-system` namespace to the `openshift-frr-k8s` namespace. This includes `FRRConfiguration` CRs created by both cluster administrators and by cluster components.
4042
====
4143

4244
[id="cluster-network-operator_{context}"]

modules/nw-bgp-routing-config.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="nw-bgp-routing-config_{context}"]
77
= Configuring Border Gateway Protocol (BGP) routing
88

9-
As a cluster administrator, you can enable or disable BGP routing support for your cluster on bare-metal infrastructure.
9+
As a cluster administrator, you can enable or disable Border Gateway Protocol (BGP) routing support for your cluster on bare-metal infrastructure.
1010

1111
If you are using BGP routing in conjunction with the MetalLB Operator, the necessary BGP routing support is enabled automatically. You do not need to manually enable BGP routing support.
1212

networking/bgp_routing/about-bgp-routing.adoc

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,17 @@ include::_attributes/common-attributes.adoc[]
66

77
toc::[]
88

9-
This feature provides native BGP routing capabilities for the cluster. Additionally, this feature must be enabled to use the RouteAdvertisements feature of the OVN-Kubernetes network plugin.
9+
This feature provides native Border Gateway Protocol (BGP) routing capabilities for the cluster.
10+
11+
////
12+
Additionally, this feature must be enabled to use the RouteAdvertisements feature of the OVN-Kubernetes network plugin.
13+
////
1014

1115
include::modules/nw-bgp-about.adoc[leveloffset=+1]
1216
include::modules/nw-metallb-frr-k8s-configuration-crd.adoc[leveloffset=+1]
13-
//include::modules/nw-bgp-routeadvertisements-object.adoc[leveloffset=+1]
14-
//include::modules/nw-bgp-examples.adoc[leveloffset=+1]
15-
1617

1718
[role="_additional-resources"]
1819
[id="additional-resources_about-bgp-routing"]
1920
== Additional resources
2021

21-
- xref:../../networking/metallb/metallb-frr-k8s.adoc#nw-metallb-frrconfiguration-crd_configure-metallb-frr-k8s[Configuring the FRRConfiguration CRD]
22-
23-
- xref:!:../../networking/multiple_networks/understanding-user-defined-network.adoc#understanding-user-defined-networks[Understanding user-defined networks]
24-
25-
- link:https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/8/html/configuring_and_managing_networking/assembly_starting-a-service-within-an-isolated-vrf-network_configuring-and-managing-networking[Starting a service within an isolated VRF network]
26-
2722
- link:https://docs.frrouting.org/en/latest/bgp.html[FRRouting User Guide: BGP]

0 commit comments

Comments
 (0)