Skip to content

Commit 8a4b50f

Browse files
authored
Merge pull request #95003 from dfitzmau/OSDOCS-14901
OSDOCS-14901: Added network-type-migration- annotation step to nw-ov…
2 parents 94a117e + 3636d7c commit 8a4b50f

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

modules/initiating-limited-live-migration.adoc

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,11 @@ $ oc get network.config.openshift.io cluster -o jsonpath='{.status.networkType}'
5858
$ oc get network.config cluster -o=jsonpath='{.status.conditions}' | jq .
5959
----
6060
+
61-
You can check limited live migration metrics for troubleshooting issues. For more information, see "Checking limited live migration metrics".
61+
You can check limited live migration metrics for troubleshooting issues. For more information, see "Checking limited live migration metrics".
62+
63+
. After a successful migration operation, remove the `network.openshift.io/network-type-migration-` annotation from the `network.config` custom resource by entering the following command:
64+
+
65+
[source,terminal]
66+
----
67+
$ oc annotate network.config cluster network.openshift.io/network-type-migration-
68+
----

modules/nw-ovn-kubernetes-migration.adoc

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ The MTU for the Geneve overlay network. This value is normally configured automa
206206
The UDP port for the Geneve overlay network. If a value is not specified, the default is `6081`. The port cannot be the same as the VXLAN port that is used by OpenShift SDN. The default value for the VXLAN port is `4789`.
207207
`ipv4_subnet`::
208208
An IPv4 address range for internal use by OVN-Kubernetes. You must ensure that the IP address range does not overlap with any other subnet used by your {product-title} installation. The IP address range must be larger than the maximum number of nodes that can be added to the cluster. The default value is `100.64.0.0/16`.
209-
`routingViaHost::
209+
`routingViaHost`::
210210
A value of `true` sets local gateway mode and a value of `false` sets shared gateway mode. The default value is `false`. In local gateway mode, traffic is routed through the host network stack. In shared gateway mode, traffic is not routed through the host network stack.
211211
`ipForwarding:`:: Set IP forwarding to `Global` alongside the local gateway mode if you need the host network of the node to act as a router for traffic not related to OVN-Kubernetes.
212212
--
@@ -460,29 +460,36 @@ $ oc get co
460460
The status of every cluster Operator must be the following: `AVAILABLE="True"`, `PROGRESSING="False"`, `DEGRADED="False"`. If a cluster Operator is not available or degraded, check the logs for the cluster Operator for more information.
461461

462462
. Complete the following steps only if the migration succeeds and your cluster is in a good state:
463-
463+
+
464464
.. To remove the migration configuration from the CNO configuration object, enter the following command:
465465
+
466466
[source,terminal]
467467
----
468468
$ oc patch Network.operator.openshift.io cluster --type='merge' \
469469
--patch '{ "spec": { "migration": null } }'
470470
----
471-
471+
+
472472
.. To remove custom configuration for the OpenShift SDN network provider, enter the following command:
473473
+
474474
[source,terminal]
475475
----
476476
$ oc patch Network.operator.openshift.io cluster --type='merge' \
477477
--patch '{ "spec": { "defaultNetwork": { "openshiftSDNConfig": null } } }'
478478
----
479-
479+
+
480480
.. To remove the OpenShift SDN network provider namespace, enter the following command:
481481
+
482482
[source,terminal]
483483
----
484484
$ oc delete namespace openshift-sdn
485485
----
486+
+
487+
.. After a successful migration operation, remove the `network.openshift.io/network-type-migration-` annotation from the `network.config` custom resource by entering the following command:
488+
+
489+
[source,terminal]
490+
----
491+
$ oc annotate network.config cluster network.openshift.io/network-type-migration-
492+
----
486493

487494
.Next steps
488495

0 commit comments

Comments
 (0)