merge conflicts 4.17

Author: JoeAldinger

_topic_maps/_topic_map.yml

@@ -1338,14 +1338,18 @@ 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
-  File: accessing-hosts
-- Name: Networking dashboards
-  File: networking-dashboards
+- Name: Networking overview
+  Dir: networking_overview
+  Distros: openshift-enterprise,openshift-origin
+  Topics:
+  - Name: Understanding networking
+    File: understanding-networking
+  - Name: Accessing hosts
+    File: accessing-hosts
+  - Name: Networking dashboards
+    File: networking-dashboards
+  - Name: CIDR range definitions
+    File: cidr-range-definitions
 - Name: Networking Operators
   Dir: networking_operators
   Distros: openshift-enterprise,openshift-origin
@@ -1486,41 +1490,6 @@ Topics:
     File: configuring-ipsec-ovn
   - Name: Zero trust networking
     File: zero-trust-networking
-- Name: Configuring the Ingress Controller for manual DNS management
-  File: ingress-controller-dnsmgt
-  Distros: openshift-enterprise,openshift-origin
-- Name: Verifying connectivity to an endpoint
-  File: verifying-connectivity-endpoint
-- Name: Changing the cluster network MTU
-  File: changing-cluster-network-mtu
-- Name: Configuring the node port service range
-  File: configuring-node-port-service-range
-- Name: Configuring the cluster network IP address range
-  File: configuring-cluster-network-range
-- Name: Configuring IP failover
-  File: configuring-ipfailover
-- Name: Configuring system controls and interface attributes using the tuning plugin
-  File: configure-syscontrols-interface-tuning-cni
-- Name: Using Stream Control Transmission Protocol
-  File: using-sctp
-  Distros: openshift-enterprise,openshift-origin
-- Name: Using PTP hardware
-  Dir: ptp
-  Topics:
-  - Name: About PTP in OpenShift cluster nodes
-    File: about-ptp
-  - Name: Configuring PTP devices
-    File: configuring-ptp
-  - Name: Developing PTP events consumer applications with the REST API v2
-    File: ptp-cloud-events-consumer-dev-reference-v2
-  - Name: PTP events REST API v2 reference
-    File: ptp-events-rest-api-reference-v2
-  - Name: Developing PTP events consumer applications with the REST API v1
-    File: ptp-cloud-events-consumer-dev-reference
-  - Name: PTP events REST API v1 reference
-    File: ptp-events-rest-api-reference
-- Name: CIDR range definitions
-  File: cidr-range-definitions
 - Name: Multiple networks
   Dir: multiple_networks
   Distros: openshift-enterprise,openshift-origin
@@ -1624,84 +1593,115 @@ Topics:
     File: tracking-network-flows
   - Name: Configuring hybrid networking
     File: configuring-hybrid-networking
-- Name: Configuring Routes
-  Dir: routes
-  Topics:
-  - Name: Route configuration
-    File: route-configuration
-  - Name: Secured routes
-    File: secured-routes
-- Name: Configuring ingress cluster traffic
-  Dir: configuring_ingress_cluster_traffic
+- Name: Ingress and load balancing
+  Dir: ingress_load_balancing
+  Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: Overview
-    File: overview-traffic
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ExternalIPs for services
-    File: configuring-externalip
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic using an Ingress Controller
-    File: configuring-ingress-cluster-traffic-ingress-controller
-  - Name: Configuring the Ingress Controller endpoint publishing strategy
-    File: nw-configuring-ingress-controller-endpoint-publishing-strategy
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic using a load balancer
-    File: configuring-ingress-cluster-traffic-load-balancer
+  - Name: Configuring Routes
+    Dir: routes
     Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic on AWS
-    File: configuring-ingress-cluster-traffic-aws
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic using a service external IP
-    File: configuring-ingress-cluster-traffic-service-external-ip
-    Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic using a NodePort
-    File: configuring-ingress-cluster-traffic-nodeport
+    Topics:
+    - Name: Route configuration
+      File: route-configuration
+    - Name: Secured routes
+      File: secured-routes
+  - Name: Configuring ingress cluster traffic
+    Dir: configuring_ingress_cluster_traffic
     Distros: openshift-enterprise,openshift-origin
-  - Name: Configuring ingress cluster traffic using load balancer allowed source ranges
-    File: configuring-ingress-cluster-traffic-load-balancer-allowed-source-ranges
+    Topics:
+    - Name: Overview
+      File: overview-traffic
+    - Name: Configuring ExternalIPs for services
+      File: configuring-externalip
+    - Name: Configuring ingress cluster traffic using an Ingress Controller
+      File: configuring-ingress-cluster-traffic-ingress-controller
+    - Name: Configuring the Ingress Controller endpoint publishing strategy
+      File: nw-configuring-ingress-controller-endpoint-publishing-strategy
+    - Name: Configuring ingress cluster traffic using a load balancer
+      File: configuring-ingress-cluster-traffic-load-balancer
+    - Name: Configuring ingress cluster traffic on AWS
+      File: configuring-ingress-cluster-traffic-aws
+    - Name: Configuring ingress cluster traffic using a service external IP
+      File: configuring-ingress-cluster-traffic-service-external-ip
+    - Name: Configuring ingress cluster traffic using a NodePort
+      File: configuring-ingress-cluster-traffic-nodeport
+    - Name: Configuring ingress cluster traffic using load balancer allowed source ranges
+      File: configuring-ingress-cluster-traffic-load-balancer-allowed-source-ranges
+    - Name: Patching existing ingress objects
+      File: configuring-ingress-cluster-patch-fields
+    - Name: Configuring the Ingress Controller for manual DNS management
+      File: ingress-controller-dnsmgt
+  - Name: Load balancing on OpenStack
+    File: load-balancing-openstack
+  - Name: Load balancing with MetalLB
+    Dir: metallb
     Distros: openshift-enterprise,openshift-origin
-  - Name: Patching existing ingress objects
-    File: configuring-ingress-cluster-patch-fields
+    Topics:
+    - Name: Configuring MetalLB address pools
+      File: metallb-configure-address-pools
+    - Name: Advertising the IP address pools
+      File: about-advertising-ipaddresspool
+    - Name: Configuring MetalLB BGP peers
+      File: metallb-configure-bgp-peers
+    - Name: Advertising an IP address pool using the community alias
+      File: metallb-configure-community-alias
+    - Name: Configuring MetalLB BFD profiles
+      File: metallb-configure-bfd-profiles
+    - Name: Configuring services to use MetalLB
+      File: metallb-configure-services
+    - Name: Managing symmetric routing with MetalLB
+      File: metallb-configure-return-traffic
+    - Name: Configuring the integration of MetalLB and FRR-K8s
+      File: metallb-frr-k8s
+    - Name: MetalLB logging, troubleshooting, and support
+      File: metallb-troubleshoot-support
+- Name: Configuring network settings
+  Dir: configuring_network_settings
+  Distros: openshift-enterprise,openshift-origin
+  Topics:
+  - Name: Configuring system controls and interface attributes using the tuning plugin
+    File: configure-syscontrols-interface-tuning-cni
+  - Name: Configuring the node port service range
+    File: configuring-node-port-service-range
+  - Name: Configuring the cluster network IP address range
+    File: configuring-cluster-network-range
+  - Name: Configuring IP failover
+    File: configuring-ipfailover
+  - Name: Configuring the cluster-wide proxy
+    File: enable-cluster-wide-proxy
+  - Name: Configuring a custom PKI
+    File: configuring-a-custom-pki
+- Name: Advanced networking
+  Dir: advanced_networking
+  Distros: openshift-enterprise, openshift-origin
+  Topics:
+  - Name: Verifying connectivity to an endpoint
+    File: verifying-connectivity-endpoint
+  - Name: Changing the cluster network MTU
+    File: changing-cluster-network-mtu
+  - Name: Using Stream Control Transmission Protocol
+    File: using-sctp
+  - Name: Associating secondary interfaces metrics to network attachments
+    File: associating-secondary-interfaces-metrics-to-network-attachments
+  - Name: Using PTP hardware
+    Dir: ptp
     Distros: openshift-enterprise,openshift-origin
-  # Kubernetes NMState (TECHNOLOGY PREVIEW)
+    Topics:
+    - Name: About PTP in OpenShift cluster nodes
+      File: about-ptp
+    - Name: Configuring PTP devices
+      File: configuring-ptp
+    - Name: Developing PTP events consumer applications with the REST API v2
+      File: ptp-cloud-events-consumer-dev-reference-v2
+    - Name: PTP events REST API v2 reference
+      File: ptp-events-rest-api-reference-v2
 - Name: Kubernetes NMState
   Dir: k8s_nmstate
   Topics:
   - Name: Observing and updating node network state and configuration
     File: k8s-nmstate-updating-node-network-config
   - Name: Troubleshooting node network configuration
     File: k8s-nmstate-troubleshooting-node-network
-- Name: Configuring the cluster-wide proxy
-  File: enable-cluster-wide-proxy
-  Distros: openshift-enterprise,openshift-origin
-- Name: Configuring a custom PKI
-  File: configuring-a-custom-pki
-  Distros: openshift-enterprise,openshift-origin
-- Name: Load balancing on OpenStack
-  File: load-balancing-openstack
-- Name: Load balancing with MetalLB
-  Dir: metallb
-  Topics:
-  - Name: Configuring MetalLB address pools
-    File: metallb-configure-address-pools
-  - Name: Advertising the IP address pools
-    File: about-advertising-ipaddresspool
-  - Name: Configuring MetalLB BGP peers
-    File: metallb-configure-bgp-peers
-  - Name: Advertising an IP address pool using the community alias
-    File: metallb-configure-community-alias
-  - Name: Configuring MetalLB BFD profiles
-    File: metallb-configure-bfd-profiles
-  - Name: Configuring services to use MetalLB
-    File: metallb-configure-services
-  - Name: Managing symmetric routing with MetalLB
-    File: metallb-configure-return-traffic
-  - Name: Configuring the integration of MetalLB and FRR-K8s
-    File: metallb-frr-k8s
-  - Name: MetalLB logging, troubleshooting, and support
-    File: metallb-troubleshoot-support
-- Name: Associating secondary interfaces metrics to network attachments
-  File: associating-secondary-interfaces-metrics-to-network-attachments
 ---
 Name: Storage
 Dir: storage

_topic_maps/_topic_map_osd.yml

@@ -826,8 +826,13 @@ Name: Networking
 Dir: networking
 Distros: openshift-dedicated
 Topics:
-- Name: About networking
-  File: about-managed-networking
+- Name: Networking overview
+  Dir: networking_overview
+  Topics:
+  - Name: About networking
+    File: about-managed-networking
+  - Name: CIDR range definitions
+    File: cidr-range-definitions
 - Name: Networking Operators
   Dir: networking_operators
   Distros: openshift-dedicated
@@ -836,12 +841,6 @@ Topics:
     File: dns-operator
   - Name: Ingress Operator in OpenShift Dedicated
     File: ingress-operator
-- Name: Network verification
-  File: network-verification
-- Name: Configuring a cluster-wide proxy during installation
-  File: configuring-cluster-wide-proxy
-- Name: CIDR range definitions
-  File: cidr-range-definitions
 - Name: Network security
   Dir: network_security
   Distros: openshift-dedicated
@@ -862,27 +861,33 @@ Topics:
       File: deleting-network-policy
     - Name: Configuring multitenant isolation with network policy
       File: multitenant-network-policy
+  - Name: Network verification
+    File: network-verification
 - Name: OVN-Kubernetes network plugin
   Dir: ovn_kubernetes_network_provider
   Topics:
   - Name: About the OVN-Kubernetes network plugin
     File: about-ovn-kubernetes
   - Name: Migrating from the OpenShift SDN network plugin
     File: migrate-from-openshift-sdn-osd
-  # - Name: Migrating from the OpenShift SDN network plugin
-    # File: migrate-from-openshift-sdn
+  - Name: Configuring a cluster-wide proxy during installation
+    File: configuring-cluster-wide-proxy
 - 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
+- Name: Ingress and load balancing
+  Dir: ingress_load_balancing
+  Distros: openshift-dedicated
   Topics:
-  - Name: Route configuration
-    File: route-configuration
-  - Name: Secured routes
-    File: secured-routes
+  - Name: Configuring Routes
+    Dir: routes
+    Topics:
+      - Name: Route configuration
+        File: route-configuration
+      - Name: Secured routes
+        File: secured-routes
 ---
 Name: Building applications
 Dir: applications

_topic_maps/_topic_map_rosa.yml

@@ -1070,8 +1070,14 @@ Name: Networking
 Dir: networking
 Distros: openshift-rosa
 Topics:
-- Name: About networking
-  File: about-managed-networking
+- Name: Networking overview
+  Dir: networking_overview
+  Distros: openshift-rosa
+  Topics:
+  - Name: About networking
+    File: about-managed-networking
+  - Name: CIDR range definitions
+    File: cidr-range-definitions
 - Name: Networking Operators
   Dir: networking_operators
   Distros: openshift-rosa
@@ -1084,12 +1090,6 @@ Topics:
     File: ingress-operator
   - Name: Ingress Node Firewall Operator in Red Hat OpenShift Service on AWS
     File: ingress-node-firewall-operator
-- Name: Network verification
-  File: network-verification
-- Name: Configuring a cluster-wide proxy during installation
-  File: configuring-cluster-wide-proxy
-- Name: CIDR range definitions
-  File: cidr-range-definitions
 - Name: Network security
   Dir: network_security
   Distros: openshift-rosa
@@ -1122,6 +1122,10 @@ Topics:
       File: default-network-policy
     - Name: Configuring multitenant isolation with network policy
       File: multitenant-network-policy
+  - Name: Audit logging for network security
+    File: logging-network-security
+  - Name: Network verification
+    File: network-verification
 - Name: OVN-Kubernetes network plugin
   Dir: ovn_kubernetes_network_provider
   Topics:
@@ -1131,18 +1135,25 @@ Topics:
     File: configuring-egress-ips-ovn
   - Name: Migrating from OpenShift SDN network plugin to OVN-Kubernetes network plugin
     File: migrate-from-openshift-sdn
+  - Name: Configuring a cluster-wide proxy during installation
+    File: configuring-cluster-wide-proxy
 - 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
+- Name: Ingress and load balancing
+  Dir: ingress_load_balancing
+  Distros: openshift-rosa
   Topics:
-  - Name: Route configuration
-    File: route-configuration
-  - Name: Secured routes
-    File: secured-routes
+  - Name: Configuring Routes
+    Dir: routes
+    Distros: openshift-rosa
+    Topics:
+    - Name: Route configuration
+      File: route-configuration
+    - Name: Secured routes
+      File: secured-routes
 ---
 Name: Building applications
 Dir: applications