Merge pull request #91330 from dfitzmau/OSDOCS-13692-15

[enterprise-4.15] OSDOCS-13692: Updated dual-stack to single-stack for IPv6

Author: dfitzmau

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

@@ -2,7 +2,12 @@
 [id="nw-dual-stack-convert-back-single-stack_{context}"]
 = Converting to a single-stack cluster network
 
-As a cluster administrator, you can convert your dual-stack cluster network to a single-stack cluster network.
+As a cluster administrator, you can convert your dual-stack cluster network to a single-stack cluster network. 
+
+[IMPORTANT]
+====
+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. 
+====
 
 .Prerequisites
 
@@ -14,13 +19,12 @@ As a cluster administrator, you can convert your dual-stack cluster network to a
 
 .Procedure
 
-. Edit the `networks.config.openshift.io` custom resource (CR) by running the
-following command:
+. Edit the `networks.config.openshift.io` custom resource (CR) by running the following command:
 +
 [source,terminal]
 ----
 $ oc edit networks.config.openshift.io
 ----
 
-. Remove the IPv6 specific configuration that you have added to the `cidr` and `hostPrefix` fields in the previous procedure.
+. 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.
 

modules/nw-dual-stack-convert.adoc

@@ -21,7 +21,6 @@ After converting to dual-stack networking only newly created pods are assigned I
 
 . To specify IPv6 address blocks for the cluster and service networks, create a file containing the following YAML:
 +
---
 [source,yaml]
 ----
 - op: add
@@ -33,10 +32,8 @@ After converting to dual-stack networking only newly created pods are assigned I
   path: /spec/serviceNetwork/-
   value: fd02::/112 <2>
 ----
-<1> Specify an object with the `cidr` and `hostPrefix` fields. The host prefix must be `64` or greater. The IPv6 CIDR prefix must be large enough to accommodate the specified host prefix.
-
+<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.
 <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.
---
 
 . To patch the cluster network configuration, enter the following command:
 +
@@ -46,11 +43,9 @@ $ oc patch network.config.openshift.io cluster \
   --type='json' --patch-file <file>.yaml
 ----
 +
---
 where:
 
 `file`:: Specifies the name of the file you created in the previous step.
---
 +
 .Example output
 [source,text]

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

@@ -16,7 +16,7 @@ You can change the join subnet used by OVN-Kubernetes to avoid conflicting with
 
 .Procedure
 
-. To change the OVN-Kubernetes join subnet, enter the following command:
+* To change the OVN-Kubernetes join subnet, enter the following command:
 +
 [source,terminal]
 ----
@@ -48,7 +48,7 @@ $ oc get network.operator.openshift.io \
   -o jsonpath="{.items[0].spec.defaultNetwork}"
 ----
 +
-It can take up to 30 minutes for this change to take effect.
+The command operation can take up to 30 minutes for this change to take effect.
 +
 .Example output
 ----

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

@@ -16,7 +16,7 @@ You can change the transit subnet used by OVN-Kubernetes to avoid conflicting wi
 
 .Procedure
 
-. To change the OVN-Kubernetes transit subnet, enter the following command:
+* To change the OVN-Kubernetes transit subnet, enter the following command:
 +
 [source,terminal]
 ----

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

@@ -11,4 +11,4 @@ As a cluster administrator, you can change the IP address ranges that the OVN-Ku
 
 include::modules/nw-ovn-kubernetes-change-join-subnet.adoc[leveloffset=+1]
 
-include::modules/nw-ovn-kubernetes-change-transit-subnet.adoc[leveloffset=+1]
+include::modules/nw-ovn-kubernetes-change-transit-subnet.adoc[leveloffset=+1]