Skip to content

Commit fc915d0

Browse files
authored
Merge pull request #83557 from dfitzmau/OCPBUGS-43373
OCPBUGS#43373: Updated the ROSA docs to explain SDN support
2 parents f3e852b + 4f06b6c commit fc915d0

File tree

4 files changed

+28
-45
lines changed

4 files changed

+28
-45
lines changed

_topic_maps/_topic_map_osd.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,13 @@ Topics:
849849
- Name: OVN-Kubernetes network plugin
850850
Dir: ovn_kubernetes_network_provider
851851
Topics:
852-
- Name: About the OpenShift SDN network plugin
852+
- Name: About the OVN-Kubernetes network plugin
853853
File: about-ovn-kubernetes
854+
- Name: OpenShift SDN network plugin
855+
Dir: ovn_kubernetes_network_provider
856+
Topics:
857+
- Name: Enabling multicast for a project
858+
File: enabling-multicast
854859
- Name: Configuring Routes
855860
Dir: routes
856861
Topics:

_topic_maps/_topic_map_rosa.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,10 +1130,15 @@ Topics:
11301130
- Name: OVN-Kubernetes network plugin
11311131
Dir: ovn_kubernetes_network_provider
11321132
Topics:
1133-
- Name: About the OpenShift SDN network plugin
1133+
- Name: About the OVN-Kubernetes network plugin
11341134
File: about-ovn-kubernetes
11351135
- Name: Configuring an egress IP address
11361136
File: configuring-egress-ips-ovn
1137+
- Name: OpenShift SDN network plugin
1138+
Dir: ovn_kubernetes_network_provider
1139+
Topics:
1140+
- Name: Enabling multicast for a project
1141+
File: enabling-multicast
11371142
- Name: Configuring Routes
11381143
Dir: routes
11391144
Topics:

networking/about-managed-networking.adoc

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,21 @@ toc::[]
1010

1111
The following are some of the most commonly used {openshift-networking} features available on your cluster:
1212

13-
- Primary cluster network provided by either of the following Container Network Interface (CNI) plugins:
14-
* xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin] - the default plugin
15-
* 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
16-
- Cluster Network Operator for network plugin management
13+
* Cluster Network Operator for network plugin management
14+
+
15+
* Primary cluster network provided by either of the following Container Network Interface (CNI) plugins:
16+
+
17+
** xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#about-ovn-kubernetes[OVN-Kubernetes network plugin], which is the default CNI plugin.
18+
** {OCP-short} SDN network plugin, which was deprecated in {OCP-short} 4.16 and removed in {OCP-short} 4.17.
19+
+
20+
[IMPORTANT]
21+
====
22+
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.
23+
====
1724
18-
{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.
25+
[discrete]
26+
[role="_additional-resources"]
27+
[id="additional-resources_{context}"]
28+
== Additional resources
1929

20-
include::snippets/sdn-deprecation-statement-managed.adoc[]
21-
22-
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].
30+
* link:https://access.redhat.com/articles/7065170[{OCP-short} SDN CNI removal in OCP 4.17]

snippets/sdn-deprecation-statement-managed.adoc

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)