Skip to content

Commit 0e15f0b

Browse files
authored
Merge pull request #91329 from dfitzmau/OSDOCS-13692-16
[enterprise-4.16] OSDOCS-13692: Updated dual-stack to single-stack for IPv6
2 parents ae5e368 + 9ab5cf9 commit 0e15f0b

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

modules/nw-dual-stack-convert-back-single-stack.adoc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
[id="nw-dual-stack-convert-back-single-stack_{context}"]
33
= Converting to a single-stack cluster network
44

5-
As a cluster administrator, you can convert your dual-stack cluster network to a single-stack cluster network.
5+
As a cluster administrator, you can convert your dual-stack cluster network to a single-stack cluster network.
6+
7+
[IMPORTANT]
8+
====
9+
If you originally converted your IPv4 single-stack cluster network to a dual-stack cluster, you can convert only back to the IPv4 single-stack cluster and not an IPv6 single-stack cluster network. The same restriction applies for converting back to an IPv6 single-stack cluster network.
10+
====
611

712
.Prerequisites
813

@@ -14,13 +19,12 @@ As a cluster administrator, you can convert your dual-stack cluster network to a
1419
1520
.Procedure
1621

17-
. Edit the `networks.config.openshift.io` custom resource (CR) by running the
18-
following command:
22+
. Edit the `networks.config.openshift.io` custom resource (CR) by running the following command:
1923
+
2024
[source,terminal]
2125
----
2226
$ oc edit networks.config.openshift.io
2327
----
2428

25-
. Remove the IPv6 specific configuration that you have added to the `cidr` and `hostPrefix` fields in the previous procedure.
29+
. Remove the IPv4 or IPv6 configuration that you added to the `cidr` and the `hostPrefix` parameters from completing the "Converting to a dual-stack cluster network " procedure steps.
2630

modules/nw-dual-stack-convert.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ If you already upgraded your cluster to {product-title} 4.16 or later and you ne
5656
path: /spec/serviceNetwork/-
5757
value: fd02::/112 <2>
5858
----
59-
<1> Specify an object with the `cidr` and `hostPrefix` fields. The host prefix must be `64` or greater. The IPv6 Classless Inter-Domain Routing (CIDR) prefix must be large enough to accommodate the specified host prefix.
59+
<1> Specify an object with the `cidr` and `hostPrefix` parameters. The host prefix must be `64` or greater. The IPv6 Classless Inter-Domain Routing (CIDR) prefix must be large enough to accommodate the specified host prefix.
6060
<2> Specify an IPv6 CIDR with a prefix of `112`. Kubernetes uses only the lowest 16 bits. For a prefix of `112`, IP addresses are assigned from `112` to `128` bits.
6161
6262
. Patch the cluster network configuration by entering the following command in your CLI:

modules/nw-ovn-kuberentes-change-join-subnet.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can change the join subnet used by OVN-Kubernetes to avoid conflicting with
1616
1717
.Procedure
1818

19-
. To change the OVN-Kubernetes join subnet, enter the following command:
19+
* To change the OVN-Kubernetes join subnet, enter the following command:
2020
+
2121
[source,terminal]
2222
----
@@ -48,7 +48,7 @@ $ oc get network.operator.openshift.io \
4848
-o jsonpath="{.items[0].spec.defaultNetwork}"
4949
----
5050
+
51-
It can take up to 30 minutes for this change to take effect.
51+
The command operation can take up to 30 minutes for this change to take effect.
5252
+
5353
.Example output
5454
----

modules/nw-ovn-kuberentes-change-transit-subnet.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can change the transit subnet used by OVN-Kubernetes to avoid conflicting wi
1616
1717
.Procedure
1818

19-
. To change the OVN-Kubernetes transit subnet, enter the following command:
19+
* To change the OVN-Kubernetes transit subnet, enter the following command:
2020
+
2121
[source,terminal]
2222
----

networking/ovn_kubernetes_network_provider/configure-ovn-kubernetes-subnets.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,8 @@ toc::[]
99
[role="_abstract"]
1010
As a cluster administrator, you can change the IP address ranges that the OVN-Kubernetes network plugin uses for the join and transit subnets.
1111

12+
// Configuring the OVN-Kubernetes join subnet
1213
include::modules/nw-ovn-kuberentes-change-join-subnet.adoc[leveloffset=+1]
14+
15+
// Configuring the OVN-Kubernetes transit subnet
1316
include::modules/nw-ovn-kuberentes-change-transit-subnet.adoc[leveloffset=+1]

0 commit comments

Comments
 (0)