Merge pull request #84487 from openshift-cherrypick-robot/cherry-pick-84452-to-enterprise-4.18

[enterprise-4.18] removes remaining SDN entries from 4.18+
2026-02-05 12:46:18 +01:00 · 2024-11-05 14:23:07 -05:00
parent ff9f09d0e3 d44ae8ffc5
commit c886c7c9a5
18 changed files with 16 additions and 20 deletions
--- a/modules/nw-egress-router-about.adoc
+++ b/modules/nw-egress-router-about.adoc
@@ -45,7 +45,7 @@ $ curl <router_service_IP> <port>
 ifdef::ovn[]
 [NOTE]
 ====
-The egress router CNI plugin supports redirect mode only. This is a difference with the egress router implementation that you can deploy with OpenShift SDN. Unlike the egress router for OpenShift SDN, the egress router CNI plugin does not support HTTP proxy mode or DNS proxy mode.
+The egress router CNI plugin supports redirect mode only. The egress router CNI plugin does not support HTTP proxy mode or DNS proxy mode.
 ====
 endif::ovn[]

--- a/modules/nw-networkpolicy-allow-application-all-namespaces.adoc
+++ b/modules/nw-networkpolicy-allow-application-all-namespaces.adoc
@@ -27,7 +27,7 @@ Follow this procedure to configure a policy that allows traffic from all pods in

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-allow-application-particular-namespace.adoc
+++ b/modules/nw-networkpolicy-allow-application-particular-namespace.adoc
@@ -30,7 +30,7 @@ Follow this procedure to configure a policy that allows traffic to a pod with th

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-allow-external-clients.adoc
+++ b/modules/nw-networkpolicy-allow-external-clients.adoc
@@ -34,7 +34,7 @@ Follow this procedure to configure a policy that allows external service from th

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-create-cli.adoc
+++ b/modules/nw-networkpolicy-create-cli.adoc
@@ -28,7 +28,7 @@ endif::multi,microshift[]

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-delete-cli.adoc
+++ b/modules/nw-networkpolicy-delete-cli.adoc
@@ -27,7 +27,7 @@ endif::multi,microshift[]

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-deny-all-allowed.adoc
+++ b/modules/nw-networkpolicy-deny-all-allowed.adoc
@@ -27,7 +27,7 @@ endif::microshift[]

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-edit.adoc
+++ b/modules/nw-networkpolicy-edit.adoc
@@ -26,7 +26,7 @@ endif::multi,microshift[]

 .Prerequisites
 ifndef::microshift[]
-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 endif::microshift[]
 * You installed the OpenShift CLI (`oc`).
 ifndef::microshift[]
--- a/modules/nw-networkpolicy-multitenant-isolation.adoc
+++ b/modules/nw-networkpolicy-multitenant-isolation.adoc
@@ -11,7 +11,7 @@ project namespaces.

 .Prerequisites

-* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin or the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes network plugin, with `mode: NetworkPolicy` set.
 * You installed the OpenShift CLI (`oc`).
 * You are logged in to the cluster with a user with `admin` privileges.

@@ -41,7 +41,7 @@ EOF
 +
 [NOTE]
 ====
-`policy-group.network.openshift.io/ingress: ""` is the preferred namespace selector label for OpenShift SDN. You can use the `network.openshift.io/policy-group: ingress` namespace selector label, but this is a legacy label.
+`policy-group.network.openshift.io/ingress: ""` is the preferred namespace selector label for OVN-Kubernetes.
 ====
 .. A policy named `allow-from-openshift-monitoring`:
 +
--- a/modules/nw-networkpolicy-project-defaults.adoc
+++ b/modules/nw-networkpolicy-project-defaults.adoc
@@ -13,7 +13,7 @@ As a cluster administrator, you can add network policies to the default template

 .Prerequisites

-* Your cluster uses a default CNI network plugin that supports `NetworkPolicy` objects, such as the OpenShift SDN network plugin with `mode: NetworkPolicy` set. This mode is the default for OpenShift SDN.
+* Your cluster uses a default CNI network plugin that supports `NetworkPolicy` objects, such as the OVN-Kubernetes.
 * You installed the OpenShift CLI (`oc`).
 * You must log in to the cluster with a user with `cluster-admin` privileges.
 * You must have created a custom default project template for new projects.
--- a/modules/nw-osp-loadbalancer-etp-local.adoc
+++ b/modules/nw-osp-loadbalancer-etp-local.adoc
@@ -11,4 +11,4 @@ Having the `ETP` option set to `Local` requires that health monitors be created

 In {rh-openstack} 16.2, the OVN Octavia provider does not support health monitors. Therefore, setting the ETP to local is unsupported.

-In {rh-openstack} 16.2, the Amphora Octavia provider does not support HTTP monitors on UDP pools. As a result, UDP load balancer services have `UDP-CONNECT` monitors created instead. Due to implementation details, this configuration only functions properly with the OVN-Kubernetes CNI plugin. When the OpenShift SDN CNI plugin is used, the UDP services alive nodes are detected unreliably. This issue also affects the OVN Octavia provider in any {rh-openstack} version because the driver does not support HTTP health monitors.
+In {rh-openstack} 16.2, the Amphora Octavia provider does not support HTTP monitors on UDP pools. As a result, UDP load balancer services have `UDP-CONNECT` monitors created instead. Due to implementation details, this configuration only functions properly with the OVN-Kubernetes CNI plugin.
--- a/modules/nw-throughput-troubleshoot.adoc
+++ b/modules/nw-throughput-troubleshoot.adoc
@@ -22,7 +22,7 @@ $ tcpdump -s 0 -i any -w /tmp/dump.pcap host <podip 1> && host <podip 2> <1>
 +
 <1> `podip` is the IP address for the pod. Run the `oc get pod <pod_name> -o wide` command to get the IP address of a pod.
 +
-The `tcpdump` command generates a file at `/tmp/dump.pcap` containing all traffic between these two pods. You can run the analyzer shortly before the issue is reproduced and stop the analyzer shortly after the issue is finished reproducing to minimize the size of the file. You can also link:https://access.redhat.com/solutions/5074041[run a packet analyzer between the nodes] (eliminating the SDN from the equation) with:
+The `tcpdump` command generates a file at `/tmp/dump.pcap` containing all traffic between these two pods. You can run the analyzer shortly before the issue is reproduced and stop the analyzer shortly after the issue is finished reproducing to minimize the size of the file. You can also link:https://access.redhat.com/solutions/5074041[run a packet analyzer between the nodes] with:
 +
 [source,terminal]
 ----
--- a/modules/rosa-nodes-machine-pools-local-zones.adoc
+++ b/modules/rosa-nodes-machine-pools-local-zones.adoc
@@ -23,7 +23,6 @@ AWS Local Zones are supported on Red{nbsp}Hat OpenShift Service on AWS 4.12. See
 ====
 Generally, the Maximum Transmission Unit (MTU) between an Amazon EC2 instance in a Local Zone and an Amazon EC2 instance in the Region is 1300. See link:https://docs.aws.amazon.com/local-zones/latest/ug/how-local-zones-work.html[How Local Zones work] in the AWS documentation.
 The cluster network MTU must always be less than the EC2 MTU to account for the overhead. The specific overhead is determined by your network plugin, for example:
-
 - OVN-Kubernetes: `100 bytes`
 - OpenShift SDN: `50 bytes`

--- a/networking/multiple_networks/configuring-additional-network.adoc
+++ b/networking/multiple_networks/configuring-additional-network.adoc
@@ -29,7 +29,7 @@ For an additional network, IP addresses are provisioned through an IP Address Ma

 [NOTE]
 ====
-When deploying {product-title} nodes with multiple network interfaces on {rh-openstack-first} with OVN SDN, DNS configuration of the secondary interface might take precedence over the DNS configuration of the primary interface. In this case, remove the DNS nameservers for the subnet id that is attached to the secondary interface:
+When deploying {product-title} nodes with multiple network interfaces on {rh-openstack-first} with OVN Kubernetes, DNS configuration of the secondary interface might take precedence over the DNS configuration of the primary interface. In this case, remove the DNS nameservers for the subnet ID that is attached to the secondary interface:
 [source,terminal]
 ----
 $ openstack subnet set --dns-nameserver 0.0.0.0 <subnet_id>
--- a/networking/network_security/network_policy/about-network-policy.adoc
+++ b/networking/network_security/network_policy/about-network-policy.adoc
@@ -13,8 +13,6 @@ As a developer, you can define network policies that restrict traffic to pods in

 include::modules/nw-networkpolicy-about.adoc[leveloffset=+1]

-include::modules/nw-networkpolicy-optimize.adoc[leveloffset=+1]
-
 include::modules/nw-networkpolicy-optimize-ovn.adoc[leveloffset=+1]

 [id="about-network-policy-next-steps"]
--- a/networking/network_security/network_policy/multitenant-network-policy.adoc
+++ b/networking/network_security/network_policy/multitenant-network-policy.adoc
@@ -13,7 +13,7 @@ As a cluster administrator, you can configure your network policies to provide m

 [NOTE]
 ====
-Configuring network policies as described in this section provides network isolation similar to the multitenant mode of OpenShift SDN in previous versions of {product-name}.
+Configuring network policies as described in this section provides network isolation similar to the multitenant mode of OpenShift SDN in previous versions of {product-title}.
 ====

 include::modules/nw-networkpolicy-multitenant-isolation.adoc[leveloffset=+1]
--- a/observability/logging/cluster-logging-deploying.adoc
+++ b/observability/logging/cluster-logging-deploying.adoc
@@ -50,6 +50,5 @@ ifdef::openshift-enterprise,openshift-origin[]
 * xref:../../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc#ovn-k-network-policy[About OVN-Kubernetes network policy]
 endif::[]
 ifdef::openshift-rosa,openshift-dedicated[]
-* link:https://docs.openshift.com/container-platform/latest/networking/openshift_sdn/about-openshift-sdn.html[About the OpenShift SDN default CNI network provider]
 * link:https://docs.openshift.com/container-platform/latest/networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.html[About the OVN-Kubernetes default Container Network Interface (CNI) network provider]
 endif::[]
--- a/virt/about_virt/about-virt.adoc
+++ b/virt/about_virt/about-virt.adoc
@@ -31,7 +31,7 @@ You can use {VirtProductName} with xref:../../networking/ovn_kubernetes_network_
 endif::openshift-rosa,openshift-dedicated[]

 ifdef::openshift-rosa,openshift-dedicated[]
-You can use {VirtProductName} with OVN-Kubernetes or OpenShift SDN.
+You can use {VirtProductName} with OVN-Kubernetes.
 endif::openshift-rosa,openshift-dedicated[]

 // Hiding links in ROSA/OSD until PR 62384 merges