Skip to content

Commit 83667e9

Browse files
authored
Merge pull request #97012 from lcavalle/TELCODOCS-2397
TELCODOCS#2397
2 parents d960e26 + c1f7122 commit 83667e9

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

modules/nw-metallb-frr-k8s-configuration-crd.adoc

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The following section provides reference examples that use the `FRRConfiguration
1212
== The routers field
1313

1414
You can use the `routers` field to configure multiple routers, one for each Virtual Routing and Forwarding (VRF) resource.
15-
For each router, you must define the Autonomous System Number (ASN).
15+
For each router, you must define the Autonomous System Number (ASN).
1616

1717
You can also define a list of Border Gateway Protocol (BGP) neighbors to connect to, as in the following example:
1818

@@ -41,7 +41,7 @@ spec:
4141
[id="nw-metallb-frrconfiguration-crd-toadvertise_{context}"]
4242
== The toAdvertise field
4343

44-
By default, `FRR-K8s` does not advertise the prefixes configured as part of a router configuration.
44+
By default, `FRR-K8s` does not advertise the prefixes configured as part of a router configuration.
4545
In order to advertise them, you use the `toAdvertise` field.
4646

4747
You can advertise a subset of the prefixes, as in the following example:
@@ -104,7 +104,7 @@ spec:
104104
[id="nw-metallb-frrconfiguration-crd-toreceive_{context}"]
105105
== The toReceive field
106106

107-
By default, `FRR-K8s` does not process any prefixes advertised by a neighbor.
107+
By default, `FRR-K8s` does not process any prefixes advertised by a neighbor.
108108
You can use the `toReceive` field to process such addresses.
109109

110110
You can configure for a subset of the prefixes, as in this example:
@@ -161,7 +161,7 @@ spec:
161161
[id="nw-metallb-frrconfiguration-crd-bgp_{context}"]
162162
== The bgp field
163163

164-
You can use the `bgp` field to define various `BFD` profiles and associate them with a neighbor.
164+
You can use the `bgp` field to define various `BFD` profiles and associate them with a neighbor.
165165
In the following example, `BFD` backs up the `BGP` session and `FRR` can detect link failures:
166166

167167
.Example FRRConfiguration CR
@@ -241,31 +241,38 @@ The fields for the `FRRConfiguration` custom resource are described in the follo
241241
|`spec.bgp.routers.neighbors.asn`
242242
|`integer`
243243
|Specifies the ASN to use for the remote end of the session.
244+
|If you use this field, you cannot specify a value in the `spec.bgp.routers.neighbors.dynamicASN` field.
245+
246+
|`spec.bgp.routers.neighbors.dynamicASN`
247+
|`string`
248+
|Detects the ASN to use for the remote end of the session without explicitly setting it.
249+
Specify `internal` for a neighbor with the same ASN, or `external` for a neighbor with a different ASN.
250+
If you use this field, you cannot specify a value in the `spec.bgp.routers.neighbors.asn` field.
244251

245252
|`spec.bgp.routers.neighbors.address`
246253
|`string`
247254
|Specifies the IP address to establish the session with.
248255

249256
|`spec.bgp.routers.neighbors.port`
250257
|`integer`
251-
|Specifies the port to dial when establishing the session.
258+
|Specifies the port to dial when establishing the session.
252259
Defaults to 179.
253260

254261
|`spec.bgp.routers.neighbors.password`
255262
|`string`
256-
|Specifies the password to use for establishing the BGP session.
263+
|Specifies the password to use for establishing the BGP session.
257264
`Password` and `PasswordSecret` are mutually exclusive.
258265

259266
|`spec.bgp.routers.neighbors.passwordSecret`
260267
|`string`
261-
|Specifies the name of the authentication secret for the neighbor.
262-
The secret must be of type "kubernetes.io/basic-auth", and in the same namespace as the FRR-K8s daemon.
263-
The key "password" stores the password in the secret.
268+
|Specifies the name of the authentication secret for the neighbor.
269+
The secret must be of type "kubernetes.io/basic-auth", and in the same namespace as the FRR-K8s daemon.
270+
The key "password" stores the password in the secret.
264271
`Password` and `PasswordSecret` are mutually exclusive.
265272

266273
|`spec.bgp.routers.neighbors.holdTime`
267274
|`duration`
268-
|Specifies the requested BGP hold time, per RFC4271.
275+
|Specifies the requested BGP hold time, per RFC4271.
269276
Defaults to 180s.
270277

271278
|`spec.bgp.routers.neighbors.keepaliveTime`
@@ -283,7 +290,7 @@ Defaults to `60s`.
283290

284291
|`spec.bgp.routers.neighbors.bfdProfile`
285292
|`string`
286-
|Specifies the name of the BFD Profile to use for the BFD session associated with the BGP session.
293+
|Specifies the name of the BFD Profile to use for the BFD session associated with the BGP session.
287294
If not set, the BFD session is not set up.
288295

289296
|`spec.bgp.routers.neighbors.toAdvertise.allowed`
@@ -292,18 +299,18 @@ If not set, the BFD session is not set up.
292299

293300
|`spec.bgp.routers.neighbors.toAdvertise.allowed.prefixes`
294301
|`string array`
295-
|Specifies the list of prefixes to advertise to a neighbor.
302+
|Specifies the list of prefixes to advertise to a neighbor.
296303
This list must match the prefixes that you define in the router.
297304

298305
|`spec.bgp.routers.neighbors.toAdvertise.allowed.mode`
299306
|`string`
300-
|Specifies the mode to use when handling the prefixes.
307+
|Specifies the mode to use when handling the prefixes.
301308
You can set to `filtered` to allow only the prefixes in the prefixes list.
302309
You can set to `all` to allow all the prefixes configured on the router.
303310

304311
|`spec.bgp.routers.neighbors.toAdvertise.withLocalPref`
305312
|`array`
306-
|Specifies the prefixes associated with an advertised local preference.
313+
|Specifies the prefixes associated with an advertised local preference.
307314
You must specify the prefixes associated with a local preference in the prefixes allowed to be advertised.
308315

309316
|`spec.bgp.routers.neighbors.toAdvertise.withLocalPref.prefixes`
@@ -341,8 +348,8 @@ You must include the prefixes associated with a local preference in the list of
341348

342349
|`spec.bgp.routers.neighbors.toReceive.allowed.mode`
343350
|`string`
344-
|Specifies the mode to use when handling the prefixes.
345-
When set to `filtered`, only the prefixes in the `prefixes` list are allowed.
351+
|Specifies the mode to use when handling the prefixes.
352+
When set to `filtered`, only the prefixes in the `prefixes` list are allowed.
346353
When set to `all`, all the prefixes configured on the router are allowed.
347354

348355
|`spec.bgp.routers.neighbors.disableMP`
@@ -363,27 +370,27 @@ When set to `all`, all the prefixes configured on the router are allowed.
363370

364371
|`spec.bgp.bfdProfiles.receiveInterval`
365372
|`integer`
366-
|Specifies the minimum interval at which this system can receive control packets, in milliseconds.
373+
|Specifies the minimum interval at which this system can receive control packets, in milliseconds.
367374
Defaults to `300ms`.
368375

369376
|`spec.bgp.bfdProfiles.transmitInterval`
370377
|`integer`
371-
|Specifies the minimum transmission interval, excluding jitter, that this system wants to use to send BFD control packets, in milliseconds.
378+
|Specifies the minimum transmission interval, excluding jitter, that this system wants to use to send BFD control packets, in milliseconds.
372379
Defaults to `300ms`.
373380

374381
|`spec.bgp.bfdProfiles.detectMultiplier`
375382
|`integer`
376-
|Configures the detection multiplier to determine packet loss.
383+
|Configures the detection multiplier to determine packet loss.
377384
To determine the connection loss-detection timer, multiply the remote transmission interval by this value.
378385

379386
|`spec.bgp.bfdProfiles.echoInterval`
380387
|`integer`
381-
|Configures the minimal echo receive transmission-interval that this system can handle, in milliseconds.
388+
|Configures the minimal echo receive transmission-interval that this system can handle, in milliseconds.
382389
Defaults to `50ms`.
383390

384391
|`spec.bgp.bfdProfiles.echoMode`
385392
|`boolean`
386-
|Enables or disables the echo transmission mode.
393+
|Enables or disables the echo transmission mode.
387394
This mode is disabled by default, and not supported on multihop setups.
388395

389396
|`spec.bgp.bfdProfiles.passiveMode`
@@ -392,13 +399,13 @@ This mode is disabled by default, and not supported on multihop setups.
392399

393400
|`spec.bgp.bfdProfiles.MinimumTtl`
394401
|`integer`
395-
|For multihop sessions only.
402+
|For multihop sessions only.
396403
Configures the minimum expected TTL for an incoming BFD control packet.
397404

398405
|`spec.nodeSelector`
399406
|`string`
400-
|Limits the nodes that attempt to apply this configuration.
401-
If specified, only those nodes whose labels match the specified selectors attempt to apply the configuration.
407+
|Limits the nodes that attempt to apply this configuration.
408+
If specified, only those nodes whose labels match the specified selectors attempt to apply the configuration.
402409
If it is not specified, all nodes attempt to apply this configuration.
403410

404411
|`status`

0 commit comments

Comments
 (0)