Merge pull request #85063 from dfitzmau/OSDOCS-12303-phase-2-16

[enterprise-4.16] OSDOCS-12303-phase-2: ContextX for Networking Operators

Author: dfitzmau

_topic_maps/_topic_map.yml

@@ -1283,6 +1283,8 @@ Topics:
   Dir: networking_operators
   Distros: openshift-enterprise,openshift-origin
   Topics:
+  - Name: About the Kubernetes NMState Operator
+    File: k8s-nmstate-about-the-k8s-nmstate-operator
   - Name: AWS Load Balancer Operator
     Dir: aws_load_balancer_operator
     Distros: openshift-enterprise,openshift-origin
@@ -1303,44 +1305,35 @@ Topics:
       File: add-tls-termination
     - Name: Configuring cluster-wide proxy on the AWS Load Balancer Operator
       File: configure-egress-proxy-aws-load-balancer-operator
+  - Name: External DNS Operator
+    Dir: external_dns_operator
+    Topics:
+    - Name: External DNS Operator release notes
+      File: external-dns-operator-release-notes
+    - Name: Understanding the External DNS Operator
+      File: understanding-external-dns-operator
+    - Name: Installing the External DNS Operator
+      File: nw-installing-external-dns-operator-on-cloud-providers
+    - Name: External DNS Operator configuration parameters
+      File: nw-configuration-parameters
+    - Name: Creating DNS records on a public hosted zone for AWS
+      File: nw-creating-dns-records-on-aws
+    - Name: Creating DNS records on a public zone for Azure
+      File: nw-creating-dns-records-on-azure
+    - Name: Creating DNS records on a public managed zone for GCP
+      File: nw-creating-dns-records-on-gcp
+    - Name: Creating DNS records on a public DNS zone for Infoblox
+      File: nw-creating-dns-records-on-infoblox
+    - Name: Configuring the cluster-wide proxy on the External DNS Operator
+      File: nw-configuring-cluster-wide-egress-proxy
 #   - Name: Understanding the Ingress Node Firewall Operator
 #     File: ingress-node-firewall-operator
-#   - Name: eBPF manager Operator
-#     Dir: ebpf_manager
-#     Topics:
-#     - Name: About the eBPF Manager Operator
-#       File: ebpf-manager-operator-about
-#     - Name: Installing the eBPF Manager Operator
-#       File: ebpf-manager-operator-install
-#     - Name: Deploying an eBPF program
-#       File: ebpf-manager-operator-deploy
 #   - Name: Understanding the Cluster Network Operator
 #     File: cluster-network-operator
 #   - Name: Understanding the DNS Operator
 #     File: dns-operator
 #   - Name: Understanding the Ingress Operator
 #     File: ingress-operator
-#   - Name: External DNS Operator
-#     Dir: external_dns_operator
-#     Topics:
-#     - Name: External DNS Operator release notes
-#       File: external-dns-operator-release-notes
-#     - Name: Understanding the External DNS Operator
-#       File: understanding-external-dns-operator
-#     - Name: Installing the External DNS Operator
-#       File: nw-installing-external-dns-operator-on-cloud-providers
-#     - Name: External DNS Operator configuration parameters
-#       File: nw-configuration-parameters
-#     - Name: Creating DNS records on a public hosted zone for AWS
-#       File: nw-creating-dns-records-on-aws
-#     - Name: Creating DNS records on a public zone for Azure
-#       File: nw-creating-dns-records-on-azure
-#     - Name: Creating DNS records on a public managed zone for GCP
-#       File: nw-creating-dns-records-on-gcp
-#     - Name: Creating DNS records on a public DNS zone for Infoblox
-#       File: nw-creating-dns-records-on-infoblox
-#     - Name: Configuring the cluster-wide proxy on the External DNS Operator
-#       File: nw-configuring-cluster-wide-egress-proxy
 #   - Name: SR-IOV Operator
 #     Dir: sr-iov-operator
 #     Distros: openshift-enterprise,openshift-origin
@@ -1351,8 +1344,6 @@ Topics:
 #       File: configuring-sriov-operator
 #     - Name: Uninstalling the SR-IOV Operator
 #       File: uninstalling-sriov-operator
-#   - Name: About the Kubernetes NMState Operator
-#     File: k8s-nmstate-about-the-k8s-nmstate-operator
 #   - Name: MetalLB Operator
 #     Dir: metallb-operator
 #     Distros: openshift-enterprise,openshift-origin
@@ -1463,27 +1454,6 @@ Topics:
     File: ptp-cloud-events-consumer-dev-reference
   - Name: PTP events REST API v1 reference
     File: ptp-events-rest-api-reference
-- Name: External DNS Operator
-  Dir: external_dns_operator
-  Topics:
-  - Name: External DNS Operator release notes
-    File: external-dns-operator-release-notes
-  - Name: Understanding the External DNS Operator
-    File: understanding-external-dns-operator
-  - Name: Installing the External DNS Operator
-    File: nw-installing-external-dns-operator-on-cloud-providers
-  - Name: External DNS Operator configuration parameters
-    File: nw-configuration-parameters
-  - Name: Creating DNS records on a public hosted zone for AWS
-    File: nw-creating-dns-records-on-aws
-  - Name: Creating DNS records on a public zone for Azure
-    File: nw-creating-dns-records-on-azure
-  - Name: Creating DNS records on a public managed zone for GCP
-    File: nw-creating-dns-records-on-gcp
-  - Name: Creating DNS records on a public DNS zone for Infoblox
-    File: nw-creating-dns-records-on-infoblox
-  - Name: Configuring the cluster-wide proxy on the External DNS Operator
-    File: nw-configuring-cluster-wide-egress-proxy
 - Name: CIDR range definitions
   File: cidr-range-definitions
 - Name: Multiple networks
@@ -1659,8 +1629,6 @@ Topics:
 - Name: Kubernetes NMState
   Dir: k8s_nmstate
   Topics:
-  - Name: About the Kubernetes NMState Operator
-    File: k8s-nmstate-about-the-k8s-nmstate-operator
   - Name: Observing and updating node network state and configuration
     File: k8s-nmstate-updating-node-network-config
   - Name: Troubleshooting node network configuration

networking/multiple_networks/configuring-additional-network.adoc

@@ -167,7 +167,7 @@ include::modules/configuring-localnet-switched-topology.adoc[tag=localnet-intro]
 [id="{context}_configuration-additional-network-types-prerequisites"]
 ===== Prerequisites for configuring OVN-Kubernetes additional network
 
-- The NMState Operator is installed. For more information, see xref:../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[About the Kubernetes NMState Operator].
+- The NMState Operator is installed. For more information, see xref:../../networking/networking_operators/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[About the Kubernetes NMState Operator].
 
 [id="{context}_configuration-additional-network-interface"]
 ===== Configuration for an OVN-Kubernetes additional network mapping

networking/network_security/configuring-ipsec-ovn.adoc

@@ -34,7 +34,7 @@ include::modules/nw-own-ipsec-modes.adoc[leveloffset=+1]
 For IPsec support for encrypting traffic to external hosts, ensure that the following prerequisites are met:
 
 * The OVN-Kubernetes network plugin must be configured in local gateway mode, where `ovnKubernetesConfig.gatewayConfig.routingViaHost=true`.
-* The NMState Operator is installed. This Operator is required for specifying the IPsec configuration. For more information, see xref:../../networking/k8s_nmstate/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[About the Kubernetes NMState Operator].
+* The NMState Operator is installed. This Operator is required for specifying the IPsec configuration. For more information, see xref:../../networking/networking_operators/k8s-nmstate-about-the-k8s-nmstate-operator.adoc#k8s-nmstate-about-the-k8s-nmstate-operator[About the Kubernetes NMState Operator].
 +
 --
 [NOTE]

networking/network_security/ingress-node-firewall-operator.adoc

@@ -22,4 +22,4 @@ include::modules/nw-infw-operator-rules-object.adoc[leveloffset=+2]
 
 include::modules/nw-infw-operator-viewing.adoc[leveloffset=+1]
 
-include::modules/nw-infw-operator-troubleshooting.adoc[leveloffset=+1]
+include::modules/nw-infw-operator-troubleshooting.adoc[leveloffset=+1]

networking/external_dns_operator/_attributes renamed to networking/networking_operators/external_dns_operator/_attributes

@@ -25,7 +25,7 @@ The following advisory is available for the External DNS Operator version 1.2.0:
 [id="external-dns-operator-1.2.0-new-features"]
 === New features
 
-* The External DNS Operator now supports AWS shared VPC. For more information, see xref:../../networking/external_dns_operator/nw-creating-dns-records-on-aws.adoc#nw-control-dns-records-public-aws-with-VPC_creating-dns-records-on-aws[Creating DNS records in a different AWS Account using a shared VPC].
+* The External DNS Operator now supports {aws-short} shared VPC. For more information, see xref:../../../networking/networking_operators/external_dns_operator/nw-creating-dns-records-on-aws.adoc#nw-control-dns-records-public-aws-with-VPC_creating-dns-records-on-aws[Creating DNS records in a different {aws-short} Account using a shared VPC].
 
 [id="external-dns-operator-1.2.0-bug-fixes"]
 === Bug fixes