Rebrand to Red Hat OpenShift Networking

Previously, the networking components of OpenShift were standalone,
but now the totality of provided networking capabilities fall under
the Red Hat OpenShift Networking umbrella.

- https://issues.redhat.com/browse/SDN-3298

Author: jab-rh

_attributes/common-attributes.adoc

@@ -155,3 +155,8 @@ endif::[]
 :openshift-dev-spaces-productname: Red Hat OpenShift Dev Spaces
 :factory-prestaging-tool: factory-precaching-cli tool
 :factory-prestaging-tool-caps: Factory-precaching-cli tool
+:openshift-networking: Red Hat OpenShift Networking
+// TODO - this probably needs to be different for OKD
+//ifdef::openshift-origin[]
+//:openshift-networking: OKD Networking
+//endif::[]

_topic_maps/_topic_map.yml

@@ -1017,6 +1017,8 @@ Name: Networking
 Dir: networking
 Distros: openshift-enterprise,openshift-origin
 Topics:
+- Name: About networking
+  File: about-networking
 - Name: Understanding networking
   File: understanding-networking
 - Name: Accessing hosts
@@ -1158,53 +1160,15 @@ Topics:
     File: configuring-hardware-offloading
   - Name: Uninstalling the SR-IOV Operator
     File: uninstalling-sriov-operator
-- Name: OpenShift SDN default CNI network provider
-  Dir: openshift_sdn
-  Topics:
-  - Name: About the OpenShift SDN default CNI network provider
-    File: about-openshift-sdn
-  - Name: Configuring egress IPs for a project
-    File: assigning-egress-ips
-    Distros: openshift-origin,openshift-enterprise
-  - Name: Configuring an egress firewall for a project
-    File: configuring-egress-firewall
-  - Name: Viewing an egress firewall for a project
-    File: viewing-egress-firewall
-  - Name: Editing an egress firewall for a project
-    File: editing-egress-firewall
-  - Name: Removing an egress firewall from a project
-    File: removing-egress-firewall
-  - Name: Considerations for the use of an egress router pod
-    File: using-an-egress-router
-  - Name: Deploying an egress router pod in redirect mode
-    File: deploying-egress-router-layer3-redirection
-  - Name: Deploying an egress router pod in HTTP proxy mode
-    File: deploying-egress-router-http-redirection
-  - Name: Deploying an egress router pod in DNS proxy mode
-    File: deploying-egress-router-dns-redirection
-  - Name: Configuring an egress router pod destination list from a config map
-    File: configuring-egress-router-configmap
-  - Name: Enabling multicast for a project
-    File: enabling-multicast
-    Distros: openshift-origin,openshift-enterprise
-  - Name: Disabling multicast for a project
-    File: disabling-multicast
-    Distros: openshift-origin,openshift-enterprise
-  - Name: Configuring multitenant isolation
-    File: multitenant-isolation
-    Distros: openshift-origin,openshift-enterprise
-  - Name: Configuring kube-proxy
-    File: configuring-kube-proxy
-    Distros: openshift-enterprise,openshift-origin
-- Name: OVN-Kubernetes default CNI network provider
+- Name: OVN-Kubernetes network plug-in
   Dir: ovn_kubernetes_network_provider
   Distros: openshift-origin,openshift-enterprise
   Topics:
-  - Name: About the OVN-Kubernetes network provider
+  - Name: About the OVN-Kubernetes network plug-in
     File: about-ovn-kubernetes
-  - Name: Migrating from the OpenShift SDN cluster network provider
+  - Name: Migrating from the OpenShift SDN network plug-in
     File: migrate-from-openshift-sdn
-  - Name: Rolling back to the OpenShift SDN cluster network provider
+  - Name: Rolling back to the OpenShift SDN network plug-in
     File: rollback-to-openshift-sdn
   - Name: Converting to IPv4/IPv6 dual stack networking
     File: converting-to-dual-stack
@@ -1236,6 +1200,44 @@ Topics:
     File: tracking-network-flows
   - Name: Configuring hybrid networking
     File: configuring-hybrid-networking
+- Name: OpenShift SDN network plug-in
+  Dir: openshift_sdn
+  Topics:
+  - Name: About the OpenShift SDN network plug-in
+    File: about-openshift-sdn
+  - Name: Configuring egress IPs for a project
+    File: assigning-egress-ips
+    Distros: openshift-origin,openshift-enterprise
+  - Name: Configuring an egress firewall for a project
+    File: configuring-egress-firewall
+  - Name: Viewing an egress firewall for a project
+    File: viewing-egress-firewall
+  - Name: Editing an egress firewall for a project
+    File: editing-egress-firewall
+  - Name: Removing an egress firewall from a project
+    File: removing-egress-firewall
+  - Name: Considerations for the use of an egress router pod
+    File: using-an-egress-router
+  - Name: Deploying an egress router pod in redirect mode
+    File: deploying-egress-router-layer3-redirection
+  - Name: Deploying an egress router pod in HTTP proxy mode
+    File: deploying-egress-router-http-redirection
+  - Name: Deploying an egress router pod in DNS proxy mode
+    File: deploying-egress-router-dns-redirection
+  - Name: Configuring an egress router pod destination list from a config map
+    File: configuring-egress-router-configmap
+  - Name: Enabling multicast for a project
+    File: enabling-multicast
+    Distros: openshift-origin,openshift-enterprise
+  - Name: Disabling multicast for a project
+    File: disabling-multicast
+    Distros: openshift-origin,openshift-enterprise
+  - Name: Configuring multitenant isolation
+    File: multitenant-isolation
+    Distros: openshift-origin,openshift-enterprise
+  - Name: Configuring kube-proxy
+    File: configuring-kube-proxy
+    Distros: openshift-enterprise,openshift-origin
 - Name: Configuring Routes
   Dir: routes
   Topics:

logging/cluster-logging-deploying.adoc

@@ -31,7 +31,7 @@ include::modules/cluster-logging-deploy-console.adoc[leveloffset=+1]
 
 If you plan to use Kibana, you must xref:#cluster-logging-visualizer-indices_cluster-logging-deploying[manually create your Kibana index patterns and visualizations] to explore and visualize data in Kibana.
 
-If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
+If your network plug-in enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
 
 
 include::modules/cluster-logging-deploy-cli.adoc[leveloffset=+1]
@@ -40,7 +40,7 @@ include::modules/cluster-logging-deploy-cli.adoc[leveloffset=+1]
 
 If you plan to use Kibana, you must xref:#cluster-logging-visualizer-indices_cluster-logging-deploying[manually create your Kibana index patterns and visualizations] to explore and visualize data in Kibana.
 
-If your cluster network provider enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
+If your network plug-in enforces network isolation, xref:#cluster-logging-deploy-multitenant_cluster-logging-deploying[allow network traffic between the projects that contain the {logging} Operators].
 
 include::modules/cluster-logging-visualizer-indices.adoc[leveloffset=+2]
 
@@ -50,8 +50,8 @@ include::modules/cluster-logging-deploy-multitenant.adoc[leveloffset=+2]
 .Additional resources
 
 * xref:../networking/network_policy/about-network-policy.adoc[About network policy]
-* xref:../networking/openshift_sdn/about-openshift-sdn.adoc[About the OpenShift SDN default CNI network provider]
-* xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc[About the OVN-Kubernetes default Container Network Interface (CNI) network provider]
+* xref:../networking/openshift_sdn/about-openshift-sdn.adoc[About the OpenShift SDN network plug-in]
+* xref:../networking/ovn_kubernetes_network_provider/about-ovn-kubernetes.adoc[About the OVN-Kubernetes network plug-in]
 
 
 // include::modules/cluster-logging-deploy-memory.adoc[leveloffset=+1]

modules/cluster-logging-deploy-multitenant.adoc

@@ -6,11 +6,11 @@
 [id="cluster-logging-deploy-multitenant_{context}"]
 = Allowing traffic between projects when network isolation is enabled
 
-Your cluster network provider might enforce network isolation. If so, you must allow network traffic between the projects that contain the operators deployed by OpenShift Logging.
+Your cluster network plug-in might enforce network isolation. If so, you must allow network traffic between the projects that contain the operators deployed by OpenShift Logging.
 
 Network isolation blocks network traffic between pods or services that are in different projects. The {logging} installs the _OpenShift Elasticsearch Operator_ in the `openshift-operators-redhat` project and the _Red Hat OpenShift Logging Operator_ in the `openshift-logging` project. Therefore, you must allow traffic between these two projects.
 
-{product-title} offers two supported choices for the default Container Network Interface (CNI) network provider, OpenShift SDN and OVN-Kubernetes. These two providers implement various network isolation policies.
+{product-title} offers two supported choices for the network plug-in, OpenShift SDN and OVN-Kubernetes. These two providers implement various network isolation policies.
 
 OpenShift SDN has three modes:
 

modules/dr-restoring-cluster-state.adoc

@@ -292,7 +292,7 @@ If the status is `Pending`, or the output lists more than one running etcd pod,
 +
 [NOTE]
 ====
-Perform the following step only if you are using `OVNKubernetes` Container Network Interface (CNI) plug-in.
+Perform the following step only if you are using `OVNKubernetes` network plug-in.
 ====
 +
 . Restart the Open Virtual Network (OVN) Kubernetes pods on all the hosts.

modules/install-sno-about-installing-on-a-single-node.adoc

@@ -10,5 +10,5 @@ You can create a single-node cluster with standard installation methods. {produc
 
 [IMPORTANT]
 ====
-The use of OpenShiftSDN with {sno} is not supported. OVN-Kubernetes is the default networking solution for {sno} deployments.
+The use of OpenShiftSDN with {sno} is not supported. OVN-Kubernetes is the default network plug-in for {sno} deployments.
 ====

modules/install-sno-generating-the-install-iso-manually.adoc

@@ -121,7 +121,7 @@ capabilities:
 <2> Set the `compute` replicas to `0`. This makes the control plane node schedulable.
 <3> Set the `controlPlane` replicas to `1`. In conjunction with the previous `compute` setting, this setting ensures the cluster runs on a single node.
 <4> Set the `metadata` name to the cluster name.
-<5> Set the `networking` details. OVN-Kubernetes is the only allowed networking type for single-node clusters.
+<5> Set the `networking` details. OVN-Kubernetes is the only allowed network plug-in type for single-node clusters.
 <6> Set the `cidr` value to match the subnet of the {sno} cluster.
 <7> Set the path to the installation disk drive, for example, `/dev/disk/by-id/wwn-0x64cd98f04fde100024684cf3034da5c2`.
 <8> Copy the {cluster-manager-url-pull} and add the contents to this configuration setting.

modules/installation-bare-metal-agent-installer-config-yaml.adoc

@@ -69,7 +69,7 @@ Class E CIDR range is reserved for a future use. To use the Class E CIDR range,
 ====
 +
 <8> The subnet prefix length to assign to each individual node. For example, if `hostPrefix` is set to `23`, then each node is assigned a `/23` subnet out of the given `cidr`, which allows for 510 (2^(32 - 23) - 2) pod IP addresses. If you are required to provide access to nodes from an external network, configure load balancers and routers to manage the traffic.
-<9> The cluster network provider Container Network Interface (CNI) plug-in to install. The supported values are `OVNKubernetes` (default value) and `OpenShiftSDN` .
+<9> The cluster network plug-in to install. The supported values are `OVNKubernetes` (default value) and `OpenShiftSDN`.
 <10> The IP address pool to use for service IP addresses. You can enter only one IP address pool. This block must not overlap with existing physical networks. If you need to access the services from an external network, configure load balancers and routers to manage the traffic.
 <11> You must set the platform to `none` for a single-node cluster. You can also set the platform to `vSphere` and `baremetal`.
 +

modules/installation-configuration-parameters.adoc

@@ -306,9 +306,9 @@ You can customize your installation configuration based on the requirements of y
 // https://bugzilla.redhat.com/show_bug.cgi?id=2020416
 // Once BM UPI supports dual-stack, uncomment all the following conditionals and blocks
 
-* If you use the OVN-Kubernetes cluster network provider, both IPv4 and IPv6 address families are supported.
+* If you use the {openshift-networking} OVN-Kubernetes network plug-in, both IPv4 and IPv6 address families are supported.
 
-* If you use the OpenShift SDN cluster network provider, only the IPv4 address family is supported.
+* If you use the {openshift-networking} OpenShift SDN network plug-in, only the IPv4 address family is supported.
 
 ifdef::ibm-cloud[]
 [NOTE]
@@ -358,13 +358,13 @@ You cannot modify parameters specified by the `networking` object after installa
 ====
 
 |`networking.networkType`
-|The cluster network provider Container Network Interface (CNI) plug-in to install.
+|The {openshift-networking} network plug-in to install.
 |
 ifdef::openshift-origin[]
 Either `OpenShiftSDN` or `OVNKubernetes`. The default value is `OVNKubernetes`.
 endif::openshift-origin[]
 ifndef::openshift-origin[]
-Either `OpenShiftSDN` or `OVNKubernetes`. `OpenShiftSDN` is a CNI provider for all-Linux networks. `OVNKubernetes` is a CNI provider for Linux networks and hybrid networks that contain both Linux and Windows servers. The default value is `OpenShiftSDN`.
+Either `OpenShiftSDN` or `OVNKubernetes`. `OpenShiftSDN` is a CNI plugin for all-Linux networks. `OVNKubernetes` is a CNI plugin for Linux networks and hybrid networks that contain both Linux and Windows servers. The default value is `OpenShiftSDN`.
 endif::openshift-origin[]
 
 |`networking.clusterNetwork`
@@ -390,7 +390,7 @@ networking:
 |
 Required if you use `networking.clusterNetwork`. An IP address block.
 
-If you use the OpenShift SDN network provider, specify an IPv4 network. If you use the OVN-Kubernetes network provider, you can specify IPv4 and IPv6 networks.
+If you use the OpenShift SDN network plug-in, specify an IPv4 network. If you use the OVN-Kubernetes network plug-in, you can specify IPv4 and IPv6 networks.
 |
 An IP address block in Classless Inter-Domain Routing (CIDR) notation.
 The prefix length for an IPv4 block is between `0` and `32`.
@@ -408,9 +408,9 @@ For an IPv6 network the default value is `64`. The default value is also the min
 |
 The IP address block for services. The default value is `172.30.0.0/16`.
 
-The OpenShift SDN and OVN-Kubernetes network providers support only a single IP address block for the service network.
+The OpenShift SDN and OVN-Kubernetes network plug-ins support only a single IP address block for the service network.
 
-If you use the OVN-Kubernetes network provider, you can specify an IP address block for both of the IPv4 and IPv6 address families.
+If you use the OVN-Kubernetes network plug-in, you can specify an IP address block for both of the IPv4 and IPv6 address families.
 
 |
 An array with an IP address block in CIDR format. For example:

modules/microshift-cni.adoc

@@ -4,9 +4,9 @@
 
 :_content-type: CONCEPT
 [id="microshift-cni_{context}"]
-= About the OVN-Kubernetes CNI network provider
+= About the OVN-Kubernetes network plugin
 
-OVN-Kubernetes is the default networking solution for {product-title} deployments. OVN-Kubernetes is a virtualized network for pods and services that is based on Open Virtual Network (OVN). The OVN-Kubernetes Container Network Interface (CNI) plug-in is the network provider for the cluster. A cluster that uses the OVN-Kubernetes network provider also runs Open vSwitch (OVS) on the node. OVN configures OVS on the node to implement the declared network configuration.
+OVN-Kubernetes is the default networking solution for {product-title} deployments. OVN-Kubernetes is a virtualized network for pods and services that is based on Open Virtual Network (OVN). The OVN-Kubernetes Container Network Interface (CNI) plugin is the network plugin for the cluster. A cluster that uses the OVN-Kubernetes network plugin also runs Open vSwitch (OVS) on the node. OVN configures OVS on the node to implement the declared network configuration.
 
 [id="microshift-network-topology_{context}"]
 == Network topology