Skip to content

Commit 961c1c1

Browse files
authored
Merge pull request #54542 from stevsmit/OSDOCS-4702
Reverts changes made at OSDOCS-3625
2 parents ca4afbc + 6554b1a commit 961c1c1

File tree

1 file changed

+42
-1
lines changed

1 file changed

+42
-1
lines changed

modules/installation-configuration-parameters.adoc

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,11 @@ You can customize your installation configuration based on the requirements of y
305305
// But only for installer-provisioned
306306
// https://bugzilla.redhat.com/show_bug.cgi?id=2020416
307307
// Once BM UPI supports dual-stack, uncomment all the following conditionals and blocks
308+
ifndef::bare[]
309+
Only IPv4 addresses are supported.
310+
endif::bare[]
308311

312+
ifdef::bare[]
309313
* If you use the {openshift-networking} OVN-Kubernetes network plug-in, both IPv4 and IPv6 address families are supported.
310314

311315
* If you use the {openshift-networking} OpenShift SDN network plug-in, only the IPv4 address family is supported.
@@ -331,12 +335,13 @@ networking:
331335
clusterNetwork:
332336
- cidr: 10.128.0.0/14
333337
hostPrefix: 23
334-
- cidr: fd01::/48
338+
- cidr: fd00:10:128::/56
335339
hostPrefix: 64
336340
serviceNetwork:
337341
- 172.30.0.0/16
338342
- fd00:172:16::/112
339343
----
344+
endif::bare[]
340345

341346
[NOTE]
342347
====
@@ -378,49 +383,80 @@ If you specify multiple IP address blocks, the blocks must not overlap.
378383

379384
[source,yaml]
380385
----
386+
ifndef::bare[]
387+
networking:
388+
clusterNetwork:
389+
- cidr: 10.128.0.0/14
390+
hostPrefix: 23
391+
endif::bare[]
392+
ifdef::bare[]
381393
networking:
382394
clusterNetwork:
383395
- cidr: 10.128.0.0/14
384396
hostPrefix: 23
385397
- cidr: fd01::/48
386398
hostPrefix: 64
399+
endif::bare[]
387400
----
388401

389402
|`networking.clusterNetwork.cidr`
390403
|
391404
Required if you use `networking.clusterNetwork`. An IP address block.
392405

406+
ifndef::bare[]
407+
An IPv4 network.
408+
endif::bare[]
409+
410+
ifdef::bare[]
393411
If you use the OpenShift SDN network plug-in, specify an IPv4 network. If you use the OVN-Kubernetes network plug-in, you can specify IPv4 and IPv6 networks.
412+
endif::bare[]
394413
|
395414
An IP address block in Classless Inter-Domain Routing (CIDR) notation.
396415
The prefix length for an IPv4 block is between `0` and `32`.
416+
ifdef::bare[]
397417
The prefix length for an IPv6 block is between `0` and `128`. For example, `10.128.0.0/14` or `fd01::/48`.
418+
endif::bare[]
398419

399420
|`networking.clusterNetwork.hostPrefix`
400421
|The subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23` then each node is assigned a `/23` subnet out of the given `cidr`. A `hostPrefix` value of `23` provides 510 (2^(32 - 23) - 2) pod IP addresses.
401422
|
402423
A subnet prefix.
403424

425+
ifndef::bare[]
426+
The default value is `23`.
427+
endif::bare[]
428+
429+
ifdef::bare[]
404430
For an IPv4 network the default value is `23`.
405431
For an IPv6 network the default value is `64`. The default value is also the minimum value for IPv6.
432+
endif::bare[]
406433

407434
|`networking.serviceNetwork`
408435
|
409436
The IP address block for services. The default value is `172.30.0.0/16`.
410437

411438
The OpenShift SDN and OVN-Kubernetes network plug-ins support only a single IP address block for the service network.
412439

440+
ifdef::bare[]
413441
If you use the OVN-Kubernetes network plug-in, you can specify an IP address block for both of the IPv4 and IPv6 address families.
442+
endif::bare[]
414443

415444
|
416445
An array with an IP address block in CIDR format. For example:
417446

418447
[source,yaml]
419448
----
449+
ifndef::bare[]
450+
networking:
451+
serviceNetwork:
452+
- 172.30.0.0/16
453+
endif::bare[]
454+
ifdef::bare[]
420455
networking:
421456
serviceNetwork:
422457
- 172.30.0.0/16
423458
- fd02::/112
459+
endif::bare[]
424460
----
425461

426462
|`networking.machineNetwork`
@@ -450,7 +486,12 @@ endif::ibm-cloud-vpc[]
450486
|
451487
An IP network block in CIDR notation.
452488

489+
ifndef::bare[]
490+
For example, `10.0.0.0/16`.
491+
endif::bare[]
492+
ifdef::bare[]
453493
For example, `10.0.0.0/16` or `fd00::/48`.
494+
endif::bare[]
454495

455496
[NOTE]
456497
====

0 commit comments

Comments
 (0)