Merge pull request #83557 from dfitzmau/OCPBUGS-43373

OCPBUGS#43373: Updated the ROSA docs to explain SDN support

Author: dfitzmau

_topic_maps/_topic_map_osd.yml

@@ -849,8 +849,13 @@ Topics:
 - Name: OVN-Kubernetes network plugin
   Dir: ovn_kubernetes_network_provider
   Topics:
-  - Name: About the OpenShift SDN network plugin
+  - Name: About the OVN-Kubernetes network plugin
     File: about-ovn-kubernetes
+- Name: OpenShift SDN network plugin
+  Dir: ovn_kubernetes_network_provider
+  Topics:
+  - Name: Enabling multicast for a project
+    File: enabling-multicast
 - Name: Configuring Routes
   Dir: routes
   Topics:

_topic_maps/_topic_map_rosa.yml

@@ -1130,10 +1130,15 @@ Topics:
 - Name: OVN-Kubernetes network plugin
   Dir: ovn_kubernetes_network_provider
   Topics:
-  - Name: About the OpenShift SDN network plugin
+  - Name: About the OVN-Kubernetes network plugin
     File: about-ovn-kubernetes
   - Name: Configuring an egress IP address
     File: configuring-egress-ips-ovn
+- Name: OpenShift SDN network plugin
+  Dir: ovn_kubernetes_network_provider
+  Topics:
+  - Name: Enabling multicast for a project
+    File: enabling-multicast
 - Name: Configuring Routes
   Dir: routes
   Topics:

networking/about-managed-networking.adoc

@@ -10,13 +10,21 @@ toc::[]
 
 The following are some of the most commonly used {openshift-networking} features available on your cluster:
 
-- Primary cluster network provided by either of the following Container Network Interface (CNI) plugins:
-  * xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin] - the default plugin
-  * link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.14/html/networking/openshift-sdn-network-plugin#nw-openshift-sdn-modes_about-openshift-sdn[OpenShift SDN network plugin]- deprecated for clusters as of OpenShift 4.14
-- Cluster Network Operator for network plugin management
+* Cluster Network Operator for network plugin management
++
+* Primary cluster network provided by either of the following Container Network Interface (CNI) plugins:
++
+** xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin], which is the default CNI plugin.
+** {OCP-short} SDN network plugin, which was deprecated in {OCP-short} 4.16 and removed in {OCP-short} 4.17.
++
+[IMPORTANT]
+====
+You cannot migrate an {OCP-short} 4.16 cluster that uses the SDN network plugin to {OCP-short} 4.17 because no migration path currently exists.
+====
 
-{product-title} clusters created with OpenShift 4.11 and above use OVN-Kubernetes network plugin by default. {product-title} clusters created before OpenShift version 4.11 use the OpenShift SDN plugin after they are upgraded to OpenShift version 4.11 and above.
+[discrete]
+[role="_additional-resources"]
+[id="additional-resources_{context}"]
+== Additional resources
 
-include::snippets/sdn-deprecation-statement-managed.adoc[]
-
-You will soon be able to migrate from OpenShift SDN to OVN for clusters running on OpenShift version 4.15 and later. This migration tool is not currently available. For more information about the OpenShift SDN deprecation and the OVN migration, see the KCS article about link:https://access.redhat.com/articles/7065170[OpenShift SDN CNI removal in OCP 4.17].
+* link:https://access.redhat.com/articles/7065170[{OCP-short} SDN CNI removal in OCP 4.17]