Merge branch 'enterprise-4.20' into cherry-pick-94090-to-enterprise-4.20

Author: lahinson

_attributes/_attributes

@@ -1 +1 @@
-../../../_attributes/
+../../_attributes/

_attributes/common-attributes.adoc

@@ -47,7 +47,7 @@ endif::[]
 :oadp-short: OADP
 :oadp-version: 1.5.0
 :oadp-version-1-3: 1.3.6
-:oadp-version-1-4: 1.4.4
+:oadp-version-1-4: 1.4.5
 :oadp-version-1-5: 1.5.0
 :oadp-bsl-api: backupstoragelocations.velero.io
 :oc-first: pass:quotes[OpenShift CLI (`oc`)]
@@ -119,7 +119,8 @@ endif::[]
 :CNVOperatorDisplayName: OpenShift Virtualization Operator
 :CNVSubscriptionSpecSource: redhat-operators
 :CNVSubscriptionSpecName: kubevirt-hyperconverged
-:IBMFusionSAN: IBM Fusion Access for SAN
+:IBMFusionFirst: IBM Fusion Access for SAN
+:FusionSAN: Fusion Access for SAN
 :delete: image:delete.png[title="Delete"]
 ifdef::openshift-origin[]
 :VirtProductName: OKD Virtualization

_topic_maps/_topic_map.yml

@@ -216,12 +216,8 @@ Topics:
       File: installing-aws-vpc
     - Name: Installing a private cluster
       File: installing-aws-private
-    - Name: Installing a cluster into a government region
-      File: installing-aws-government-region
-    - Name: Installing a cluster into a Secret or Top Secret Region
-      File: installing-aws-secret-region
-    - Name: Installing a cluster into a China region
-      File: installing-aws-china
+    - Name: Installing a cluster in a specialized region
+      File: installing-aws-specialized-region
     - Name: Installing a cluster with compute nodes on Local Zones
       File: installing-aws-localzone
     - Name: Installing a cluster with compute nodes on Wavelength Zones
@@ -617,8 +613,6 @@ Topics:
       File: installing-vsphere-installer-provisioned
     - Name: Installing a cluster with customizations
       File: installing-vsphere-installer-provisioned-customizations
-    - Name: Installing a cluster with network customizations
-      File: installing-vsphere-installer-provisioned-network-customizations
     - Name: Installing a cluster in a disconnected environment
       File: installing-restricted-networks-installer-provisioned-vsphere
   - Name: User-provisioned infrastructure
@@ -1258,8 +1252,6 @@ Topics:
     File: external-secrets-operator-release-notes
   - Name: Installing the External Secrets Operator
     File: external-secrets-operator-install
-  - Name: Monitoring the External Secrets Operator
-    File: external-secrets-operator-monitoring
   - Name: Uninstalling the External Secrets Operator
     File: external-secrets-operator-uninstall
   - Name: External Secrets Operator APIs
@@ -1385,12 +1377,18 @@ Name: Networking
 Dir: networking
 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: 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
@@ -1545,37 +1543,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: CIDR range definitions
-  File: cidr-range-definitions
 - Name: Multiple networks
   Dir: multiple_networks
   Distros: openshift-enterprise,openshift-origin
@@ -1681,90 +1648,119 @@ 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
-  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
-    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
+- Name: Ingress and load balancing
+  Dir: ingress_load_balancing
+  Distros: openshift-enterprise,openshift-origin
+  Topics:
+  - Name: Configuring Routes
+    Dir: routes
     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: 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: Patching existing ingress objects
-    File: configuring-ingress-cluster-patch-fields
+    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: Allocating load balancers to specific subnets
+      File: allocating-load-balancers
+    - Name: Configuring the Ingress Controller for manual DNS management
+      File: ingress-controller-dnsmgt
+    - Name: Gateway API with OpenShift Container Platform networking
+      File: ingress-gateway-api
+  - Name: Load balancing on OpenStack
+    File: load-balancing-openstack
+  - Name: Load balancing with MetalLB
+    Dir: metallb
     Distros: openshift-enterprise,openshift-origin
-  - Name: Allocating load balancers to specific subnets
-    File: allocating-load-balancers
+    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
-  - Name: Gateway API with OpenShift Container Platform networking
-    File: ingress-gateway-api
-    Distros: openshift-enterprise
-  # 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
@@ -3222,8 +3218,8 @@ Topics:
       File: otel-collector-target-allocator
   - Name: Configuring the instrumentation
     File: otel-configuration-of-instrumentation
-  - Name: Sending traces and metrics to the Collector
-    File: otel-sending-traces-and-metrics-to-otel-collector
+  - Name: Sending traces, logs, and metrics to the Collector
+    File: otel-sending-traces-logs-and-metrics-to-otel-collector
   - Name: Configuring metrics for the monitoring stack
     File: otel-configuring-metrics-for-monitoring-stack
   - Name: Forwarding telemetry data
@@ -3287,6 +3283,8 @@ Topics:
   Dir: power_monitoring
   Distros: openshift-enterprise,openshift-origin
   Topics:
+  - Name: Power monitoring 0.5 release notes
+    File: power-monitoring-release-notes-tp-0-5
   - Name: Power monitoring release notes
     File: power-monitoring-release-notes
   - Name: Power monitoring overview
@@ -3299,6 +3297,10 @@ Topics:
     File: visualizing-power-monitoring-metrics
   - Name: Uninstalling power monitoring
     File: uninstalling-power-monitoring
+  - Name: Power monitoring references
+    File: power-monitoring-references
+  - Name: Power monitoring API reference
+    File: power-monitoring-api-reference
 ---
 Name: Scalability and performance
 Dir: scalability_and_performance
@@ -3751,8 +3753,8 @@ Topics:
       File: velero-cli-tool
     - Name: Pods crash or restart due to lack of memory or CPU
       File: pods-crash-or-restart-due-to-lack-of-memory-or-cpu
-    - Name: Issues with Velero and admission webhooks
-      File: issues-with-velero-and-admission-webhooks
+    - Name: Restoring workarounds for Velero backups that use admission webhooks
+      File: restoring-workarounds-for-velero-backups-that-use-admission-webhooks
     - Name: OADP installation issues
       File: oadp-installation-issues
     - Name: OADP Operator issues
@@ -4649,7 +4651,7 @@ Topics:
   Distros: openshift-enterprise
   Topics:
   - Name: OpenShift Virtualization release notes
-    File: virt-4-19-release-notes
+    File: virt-4-20-release-notes
 - Name: Getting started
   Dir: getting_started
   Topics:
@@ -4694,6 +4696,13 @@ Topics:
     File: virt-configuring-higher-vm-workload-density
   - Name: Configuring certificate rotation
     File: virt-configuring-certificate-rotation
+- Name: Virtualization with IBM Fusion Access for SAN
+  Dir: fusion_access_SAN
+  Topics:
+  - Name: IBM Fusion Access for SAN overview
+    File: fusion-access-san-overview
+  - Name: Install and configure IBM Fusion Access for SAN
+    File: install-configure-fusion-access-san
 - Name: Updating
   Dir: updating
   Topics: