Skip to content

Commit df5ec0a

Browse files
authored
Merge pull request #88589 from mletalie/OSDOCS-13391
[OSDOCS-13391]SDN to OVN Doc Follow-Up
2 parents 24d37fd + a468c9a commit df5ec0a

File tree

5 files changed

+31
-12
lines changed

5 files changed

+31
-12
lines changed

modules/migrate-sdn-ovn-osd.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
:_mod-docs-content-type: PROCEDURE
55
[id="migrate-sdn-ovn-ocm-cli_{context}"]
6-
= Initiate migration using the OpenShift Cluster Manager API command-line interface (ocm) CLI
6+
= Initiating migration using the OpenShift Cluster Manager API command-line interface (ocm) CLI
77

88
[WARNING]
99
====

modules/migrate-sdn-ovn.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
:_mod-docs-content-type: PROCEDURE
55
[id="migrate-sdn-ovn-cli_{context}"]
6-
= Initiate migration using the ROSA CLI
6+
= Initiating migration using the ROSA CLI
77

88
[WARNING]
99
====
@@ -25,11 +25,12 @@ $ rosa edit cluster -c <cluster_id> <1>
2525
You cannot include the optional flag `--ovn-internal-subnets` in the command unless you define a value for the flag `--network-type`.
2626
====
2727

28-
:_mod-docs-content-type: PROCEDURE
29-
[id="verify-sdn-ovn_{context}"]
30-
= Verify migration status using the ROSA CLI
28+
.Verification
29+
30+
* To check the status of the migration, run the following command:
31+
32+
+
3133
32-
To check the status of the migration, run the following command:
3334
[source,terminal]
3435
----
3536
$ rosa describe cluster -c <cluster_id> <1>

networking/about-managed-networking.adoc

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@ ifdef::openshift-rosa[]
2323
====
2424
Before upgrading {rosa-classic} clusters that are configured with the OpenShift SDN network plugin to version 4.17, you must migrate to the OVN-Kubernetes network plugin. For more information, see _Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin_ in the _Additional resources_ section.
2525
====
26-
2726
endif::openshift-rosa[]
27+
28+
ifdef::openshift-dedicated[]
29+
30+
[IMPORTANT]
31+
====
32+
Before upgrading {product-title} clusters that are configured with the OpenShift SDN network plugin to version 4.17, you must migrate to the OVN-Kubernetes network plugin. For more information, see _Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin_ in the _Additional resources_ section.
33+
====
34+
endif::openshift-dedicated[]
35+
36+
2837
[discrete]
2938
[role="_additional-resources"]
3039
[id="additional-resources_{context}"]
@@ -34,3 +43,9 @@ endif::openshift-rosa[]
3443
ifdef::openshift-rosa[]
3544
* xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin]
3645
endif::openshift-rosa[]
46+
47+
ifdef::openshift-dedicated[]
48+
49+
* xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn-osd.adoc#migrate-from-openshift-sdn-osd[Migrating from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin]
50+
endif::openshift-dedicated[]
51+

networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn-osd.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin
44
include::_attributes/common-attributes.adoc[]
55
include::_attributes/attributes-openshift-dedicated.adoc[]
6-
:context: migrate-from-openshift-sdn
6+
:context: migrate-from-openshift-sdn-osd
77

88
toc::[]
99

@@ -21,4 +21,4 @@ Some considerations before starting migration initiation are:
2121
include::modules/migrate-sdn-ovn-osd.adoc[leveloffset=+1]
2222

2323
.Additional resources
24-
link:https://docs.openshift.com/container-platform/4.16/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.html#patching-ovnk-address-ranges_migrate-from-openshift-sdn[Patching OVN-Kubernetes address ranges]
24+
* link:https://docs.openshift.com/container-platform/4.16/networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.html#patching-ovnk-address-ranges_migrate-from-openshift-sdn[Patching OVN-Kubernetes address ranges]

rosa_release_notes/rosa-release-notes.adoc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ ifdef::openshift-rosa[]
2626
+
2727
// * **{product-title} SDN network plugin blocks future major upgrades**
2828
* **Initiate live migration from OpenShift SDN to OVN-Kubernetes.**
29-
As part of the {product-title} move to OVN-Kubernetes as the only supported network plugin starting with {product-title} 4.17, users can now initiate live migration from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin.
30-
If your cluster uses the OpenShift SDN network plugin, you cannot upgrade to future major versions of {product-title} without migrating to OVN-Kubernetes. For more information about migrating to OVN-Kubernetes, see xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin].
31-
29+
As part of the {product-title} move to OVN-Kubernetes as the only supported network plugin starting with {product-title} version 4.17, users can now initiate live migration from the OpenShift SDN network plugin to the OVN-Kubernetes network plugin.
30+
+
31+
If your cluster uses the OpenShift SDN network plugin, you cannot upgrade to future major versions of {product-title} without migrating to OVN-Kubernetes.
32+
+
33+
For more information about migrating to OVN-Kubernetes, see xref:../networking/ovn_kubernetes_network_provider/migrate-from-openshift-sdn.adoc#migrate-from-openshift-sdn[Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin].
34+
+
3235
[IMPORTANT]
3336
====
3437
Egress lockdown is a Technology Preview feature.

0 commit comments

Comments
 (0)