Merge branch 'openshift:main' into cp_latency

Author: shahsahil264

.vale/styles/config/vocabularies/OpenShiftDocs/accept.txt

@@ -1,11 +1,13 @@
 # Regex terms added to accept.txt are ignored by the Vale linter and override RedHat Vale rules.
 # Add terms that have a corresponding incorrectly capitalized form to reject.txt.
 [Ff]ronthaul
+[Mm][Bb]ps
 [Mm]idhaul
 [Pp]assthrough
 [Pp]ostinstall
 [Pp]recaching
 [Pp]reinstall
+[Oo]n-premise
 [Rr]ealtime
 [Tt]elco
 Assisted Installer
@@ -17,7 +19,6 @@ gpspipe
 hyperthreads?
 KPIs?
 linuxptp
-[Mm][Bb]ps
 Mellanox
 MetalLB
 NICs?

_attributes/common-attributes.adoc

@@ -164,7 +164,7 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.5.1
+:SMProductVersion: 2.5.2
 :MaistraVersion: 2.5
 :KialiProduct: Kiali Operator provided by Red Hat
 :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin
@@ -203,9 +203,16 @@ endif::[]
 :osdk_ver: 1.31.0
 //Operator SDK version that shipped with the previous OCP 4.x release
 :osdk_ver_n1: 1.28.0
+//Version-agnostic OLM
+:olm-first: Operator Lifecycle Manager (OLM)
+:olm: OLM
+//Initial version of OLM that shipped with OCP 4, aka "v0"
+:olmv0: legacy OLM
+:olmv0-first: legacy Operator Lifecycle Manager (OLM)
 //Next-gen (OCP 4.14+) Operator Lifecycle Manager, aka "v1"
 :olmv1: OLM 1.0
 :olmv1-first: Operator Lifecycle Manager (OLM) 1.0
+//
 :ztp-first: GitOps Zero Touch Provisioning (ZTP)
 :ztp: GitOps ZTP
 :3no: three-node OpenShift

_topic_maps/_topic_map.yml

@@ -1,3 +1,4 @@
+# trunk-ignore-all(prettier)
 # This configuration file dictates the organization of the topic groups and
 # topics on the main page of the doc site for this branch. Each record
 # consists of the following:
@@ -131,6 +132,8 @@ Topics:
     File: installing-mirroring-installation-images
   - Name: Mirroring images for a disconnected installation using the oc-mirror plugin
     File: installing-mirroring-disconnected
+  - Name: Mirroring images for a disconnected installation using oc-mirror V2
+    File: about-installing-oc-mirror-v2
 - Name: Installing on Alibaba
   Dir: installing_alibaba
   Distros: openshift-origin,openshift-enterprise
@@ -1273,14 +1276,20 @@ Topics:
   File: accessing-hosts
 - Name: Networking dashboards
   File: networking-dashboards
-- Name:  OpenShift network security
-  Dir: openshift_network_security
+- Name:  Network security
+  Dir: network_security
   Distros: openshift-enterprise,openshift-origin
   Topics:
-  - Name: About OVN-Kubernetes network policy
-    File: ovn-k-network-policy
-  - Name: AdminNetworkPolicy
-    File: ovn-k-anp
+  - Name: Understanding network policy APIs
+    File: network-policy-apis
+  - Name: Admin network policy
+    Dir: AdminNetworkPolicy
+    Distros: openshift-enterprise, openshift-origin
+    Topics:
+    - Name: About AdminNetworkPolicy
+      File: ovn-k-anp
+    - Name: About BaselineAdminNetworkPolicy
+      File: ovn-k-banp
   - Name: Network policy
     Dir: network_policy
     Distros: openshift-enterprise, openshift-origin
@@ -1299,8 +1308,8 @@ Topics:
       File: default-network-policy
     - Name: Configuring multitenant isolation with network policy
       File: multitenant-network-policy
-  - Name: BaselineAdminNetworkPolicy
-    File: ovn-k-banp
+  - Name: Audit logging for network security
+    File: logging-network-security
   - Name: Understanding the Ingress Node Firewall Operator
     File: ingress-node-firewall-operator
   - Name: Egress Firewall
@@ -1476,8 +1485,6 @@ Topics:
     File: rollback-to-openshift-sdn
   - Name: Converting to IPv4/IPv6 dual stack networking
     File: converting-to-dual-stack
-  - Name: Logging for egress firewall and network policy rules
-    File: logging-network-policy
   - Name: Configure an external gateway on the default network
     File: configuring-secondary-external-gateway
   - Name: Configuring an egress IP address
@@ -1992,8 +1999,6 @@ Topics:
       File: olmv1-catalogd
   - Name: Installing an Operator from a catalog
     File: olmv1-installing-an-operator-from-a-catalog
-  - Name: Managing plain bundles
-    File: olmv1-managing-plain-bundles
 ---
 Name: CI/CD
 Dir: cicd
@@ -2605,8 +2610,9 @@ Topics:
     File: nodes-sno-worker-nodes
 - Name: Node metrics dashboard
   File: nodes-dashboard-using
-- Name: Manage secure signatures with sigstore
-  File: nodes-sigstore-using
+# Hiding this section until 4.17.
+#- Name: Manage secure signatures with sigstore
+#  File: nodes-sigstore-using
 ---
 Name: Windows Container Support for OpenShift
 Dir: windows_containers

_topic_maps/_topic_map_osd.yml

@@ -833,12 +833,12 @@ Topics:
   File: configuring-cluster-wide-proxy
 - Name: CIDR range definitions
   File: cidr-range-definitions
-- Name: OpenShift network security
-  Dir: openshift_network_security
+- Name: Network security
+  Dir: network_security
   Distros: openshift-dedicated
   Topics:
-  - Name: About OVN-Kubernetes network policy
-    File: ovn-k-network-policy
+  - Name: Understanding network policy APIs
+    File: network-policy-apis
   - Name: Network policy
     Dir: network_policy
     Distros: openshift-dedicated

_topic_maps/_topic_map_rosa.yml

@@ -588,6 +588,7 @@ Topics:
     File: nodes-cluster-resource-configure
 - Name: Configuring PID limits
   File: rosa-configuring-pid-limits
+  Distros: openshift-rosa
 ---
 Name: Security and compliance
 Dir: security
@@ -1056,13 +1057,19 @@ Topics:
   File: configuring-cluster-wide-proxy
 - Name: CIDR range definitions
   File: cidr-range-definitions
-- Name:  OpenShift network security
-  Dir: openshift_network_security
+- Name:  Network security
+  Dir: network_security
   Topics:
-  - Name: About OVN-Kubernetes network policy
-    File: ovn-k-network-policy
-  - Name: AdminNetworkPolicy
-    File: ovn-k-anp
+  - Name: Understanding network policy APIs
+    File: network-policy-apis
+  - Name: Admin network policy
+    Dir: AdminNetworkPolicy
+    Distros: openshift-rosa
+    Topics:
+    - Name: About AdminNetworkPolicy
+      File: ovn-k-anp
+    - Name: About BaselineAdminNetworkPolicy
+      File: ovn-k-banp
   - Name: Network policy
     Dir: network_policy
     Distros: openshift-rosa
@@ -1081,8 +1088,6 @@ Topics:
       File: default-network-policy
     - Name: Configuring multitenant isolation with network policy
       File: multitenant-network-policy
-  - Name: BaselineAdminNetworkPolicy
-    File: ovn-k-banp
 - Name: OVN-Kubernetes network plugin
   Dir: ovn_kubernetes_network_provider
   Topics:

_topic_maps/_topic_map_rosa_hcp.yml

@@ -552,9 +552,9 @@ Topics:
 #    File: rosa-cluster-auth
 #  - Name: Authorization and RBAC
 #    File: rosa-auth-rbac
-  - Name: Cluster notifications
-    File: rosa-cluster-notifications
-    Distros: openshift-rosa-hcp
+- Name: Cluster notifications
+  File: rosa-cluster-notifications
+  Distros: openshift-rosa-hcp
 # - Name: Configuring private connections
 #   Dir: cloud_infrastructure_access
 #   Distros: openshift-rosa-hcp
@@ -584,8 +584,9 @@ Topics:
 #     File: rosa-nodes-about-autoscaling-nodes
 #   - Name: Configuring cluster memory to meet container memory and risk requirements
 #     File: nodes-cluster-resource-configure
-# - Name: Configuring PID limits
-#   File: rosa-configuring-pid-limits
+- Name: Configuring PID limits
+  File: rosa-configuring-pid-limits
+  Distros: openshift-rosa
 # ---
 # Name: Security and compliance
 # Dir: security

modules/olm-rukpak-plain-bundle.adoc …used_topics/olm-rukpak-plain-bundle.adocmodules/olm-rukpak-plain-bundle.adoc renamed to _unused_topics/olm-rukpak-plain-bundle.adoc modules/olm-rukpak-plain-bundle.adoc renamed to _unused_topics/olm-rukpak-plain-bundle.adoc

@@ -35,4 +35,4 @@ The static manifests must be located in the `manifests/` directory with at least
 [IMPORTANT]
 ====
 Do not include any content in the `manifests/` directory of a plain bundle that are not static manifests. Otherwise, a failure will occur when creating content on-cluster from that bundle. Any file that would not successfully apply with the `oc apply` command will result in an error. Multi-object YAML or JSON files are valid, as well.
-====
+====

modules/olmv1-adding-plain-to-fbc.adoc …ed_topics/olmv1-adding-plain-to-fbc.adocmodules/olmv1-adding-plain-to-fbc.adoc renamed to _unused_topics/olmv1-adding-plain-to-fbc.adoc modules/olmv1-adding-plain-to-fbc.adoc renamed to _unused_topics/olmv1-adding-plain-to-fbc.adoc

@@ -118,4 +118,4 @@ The `opm render` command does not support adding plain bundles to catalogs. You
 [source,terminal]
 ----
 $ opm validate <catalog_dir>
-----
+----

modules/olmv1-building-plain-image.adoc …d_topics/olmv1-building-plain-image.adocmodules/olmv1-building-plain-image.adoc renamed to _unused_topics/olmv1-building-plain-image.adoc modules/olmv1-building-plain-image.adoc renamed to _unused_topics/olmv1-building-plain-image.adoc

@@ -35,4 +35,4 @@ $ podman build -f plainbundle.Dockerfile -t \
 [source,terminal]
 ----
 $ podman push quay.io/<organization_name>/<repository_name>:<image_tag>
-----
+----

…olm_v1/olmv1-managing-plain-bundles.adoc …topics/olmv1-managing-plain-bundles.adocoperators/olm_v1/olmv1-managing-plain-bundles.adoc renamed to _unused_topics/olmv1-managing-plain-bundles.adoc operators/olm_v1/olmv1-managing-plain-bundles.adoc renamed to _unused_topics/olmv1-managing-plain-bundles.adoc

@@ -69,4 +69,4 @@ manifests
 include::modules/olmv1-building-plain-image.adoc[leveloffset=+1]
 include::modules/olmv1-creating-fbc.adoc[leveloffset=+1]
 include::modules/olmv1-adding-plain-to-fbc.adoc[leveloffset=+1]
-include::modules/olmv1-publishing-fbc.adoc[leveloffset=+1]
+include::modules/olmv1-publishing-fbc.adoc[leveloffset=+1]