Merge pull request #81231 from max-cx/dtotel-docs-3.3update

dtotel-docs-3.3 branch update

Author: kalexand-rh

.s2i/httpd-cfg/01-commercial.conf

@@ -318,12 +318,12 @@ AddType text/vtt                            vtt
     # redirect any links to existing ROSA/Dedicated embedded content to standalone equivalent
     RewriteRule ^(rosa|dedicated)/serverless/?(.*)$ /serverless/1.33/$2  [L,R=302]
 
-    # redirect builds latest to 1.0
+    # redirect builds latest to 1.1
     RewriteRule ^builds/?$ /builds/latest [R=302]
-    RewriteRule ^builds/latest/?(.*)$ /builds/1.0/$1 [NE,R=302]
+    RewriteRule ^builds/latest/?(.*)$ /builds/1.1/$1 [NE,R=302]
 
     # redirect top-level without filespec to the about file
-    RewriteRule ^builds/(1\.0)/?$ /builds/$1/about/overview-openshift-builds.html  [L,R=302]
+    RewriteRule ^builds/(1\.0|1\.1)/?$ /builds/$1/about/overview-openshift-builds.html  [L,R=302]
 
     # Builds using Shipwright landing page
     RewriteRule ^container-platform/(4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/builds_using_shipwright/overview-openshift-builds.html /builds/latest/about/overview-openshift-builds.html  [L,R=302]

_attributes/attributes-openshift-dedicated.adoc

@@ -17,6 +17,7 @@
 :hybrid-console-url: link:https://console.redhat.com[Red Hat Hybrid Cloud Console]
 :AWS: Amazon Web Services (AWS)
 :GCP: Google Cloud Platform (GCP)
+:openshift-networking: Red Hat OpenShift Networking
 :product-registry: OpenShift image registry
 :kebab: image:kebab.png[title="Options menu"]
 :rhq-short: Red Hat Quay

_attributes/common-attributes.adoc

@@ -214,9 +214,9 @@ endif::[]
 :olmv0-caps: Legacy OLM
 :olmv0-first: legacy Operator Lifecycle Manager (OLM)
 :olmv0-first-caps: 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
+//Next-gen (OCP 4.14+) Operator Lifecycle Manager, f/k/a "1.0"
+:olmv1: OLM v1
+:olmv1-first: Operator Lifecycle Manager (OLM) v1
 //
 :ztp-first: GitOps Zero Touch Provisioning (ZTP)
 :ztp: GitOps ZTP

_distro_map.yml

@@ -312,7 +312,7 @@ openshift-acs:
       dir: acs/4.4
     rhacs-docs-4.5:
       name: '4.5'
-      dir: acs/4.5  
+      dir: acs/4.5
 microshift:
   name: Red Hat build of MicroShift
   author: OpenShift Documentation Project <[email protected]>
@@ -414,6 +414,9 @@ openshift-builds:
     build-docs-1.0:
       name: '1.0'
       dir: builds/1.0
+    build-docs-1.1:
+      name: '1.1'
+      dir: builds/1.1
 openshift-lightspeed:
   name: Red Hat OpenShift Lightspeed
   author: OpenShift documentation team <[email protected]>
@@ -432,5 +435,5 @@ openshift-service-mesh:
   site_url: https://docs.openshift.com/
   branches:
     service-mesh-docs-3.0.0tp1:
-      name: '3.0tp1'
+      name: '3.0.0tp1'
       dir: service-mesh/3.0.0tp1

_templates/_page_openshift.html.erb

@@ -75,6 +75,14 @@
       </span>
       <% end %>
 
+      <% if (distro_key == "openshift-service-mesh") %>
+      <span>
+        <div class="alert alert-danger" role="alert" id="support-alert">
+          <strong>OpenShift Service Mesh 3.0 is a Technology Preview feature only. Technology Preview features are not supported with Red Hat production service level agreements (SLAs) and might not be functionally complete. Red Hat does not recommend using them in production. These features provide early access to upcoming product features, enabling customers to test functionality and provide feedback during the development process. This documentation is a work in progress and might not be complete or fully tested.</strong>.
+        </div>
+      </span>
+      <% end %>
+
       <% if (version == "4.17") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu" && distro_key != "rosa-hcp") %>
       <span>
         <div class="alert alert-danger" role="alert" id="support-alert">
@@ -251,6 +259,7 @@
             </a>
             <select id="version-selector" onchange="versionSelector(this);">
               <option value="1.0">1.0</option>
+              <option value="1.1">1.1</option>
             </select>
         <% elsif (distro_key == "openshift-gitops") %>
             <a href="https://docs.openshift.com/gitops/<%= version %>/release_notes/gitops-release-notes.html">
@@ -271,6 +280,13 @@
             <select id="version-selector" onchange="versionSelector(this);">
               <option value="1.0tp1">1.0tp1</option>
             </select>
+        <% elsif (distro_key == "openshift-service-mesh") %>
+            <a href="https://docs.openshift.com/service-mesh/<%= version %>/about/ossm-about-openshift-service-mesh.html">
+              <%= distro %>
+            </a>
+            <select id="version-selector" onchange="versionSelector(this);">
+              <option value="3.0.0tp1">3.0tp1</option>
+            </select>
         <% elsif (distro_key == "openshift-telco") %>
             <a href="https://docs.openshift.com/container-platform-telco/<%= version %>/welcome/index.html">
               <%= distro %>
@@ -314,7 +330,7 @@
       <li class="hidden-xs active">
         <%= breadcrumb_topic %>
       </li>
-      <% if (distro_key != "openshift-origin" && distro_key != "openshift-aro" && distro_key != "openshift-acs"  && distro_key != "openshift-serverless"  && distro_key != "openshift-gitops" && distro_key != "openshift-pipelines" && distro_key != "openshift-builds" && distro_key != "openshift-lightspeed" && distro_key != "openshift-telco") %>
+      <% if (distro_key != "openshift-origin" && distro_key != "openshift-aro" && distro_key != "openshift-acs"  && distro_key != "openshift-serverless"  && distro_key != "openshift-gitops" && distro_key != "openshift-pipelines" && distro_key != "openshift-builds" && distro_key != "openshift-lightspeed" && distro_key != "openshift-service-mesh" && distro_key != "openshift-telco") %>
       <span text-align="right" style="float: right !important">
         <a href="https://github.com/openshift/openshift-docs/commits/<%=
         ((distro_key == "openshift-enterprise") ? "enterprise-#{version}"
@@ -512,7 +528,8 @@
     'openshift-pipelines' : ['docs_pipelines', version],
     'openshift-builds' : ['docs_builds', version],
     'openshift-gitops' : ['docs_gitops', version],
-    'openshift-lightspeed' : ['docs_lightspeed', version]
+    'openshift-lightspeed' : ['docs_lightspeed', version],
+    'openshift-service-mesh' : ['docs_service_mesh', version]
   };
 
   // only OSD v3 docs have the version variable specified

_topic_maps/_topic_map.yml

@@ -202,6 +202,9 @@ Topics:
     File: uninstalling-cluster-aws
   - Name: Installation configuration parameters
     File: installation-config-parameters-aws
+  - Name: AWS Local Zone or Wavelength Zone tasks
+    File: aws-compute-edge-zone-tasks
+    Distros: openshift-enterprise
 - Name: Installing on Azure
   Dir: installing_azure
   Distros: openshift-origin,openshift-enterprise
@@ -556,6 +559,12 @@ Topics:
     File: using-vsphere-problem-detector-operator
   - Name: Installation configuration parameters
     File: installation-config-parameters-vsphere
+  - Name: Regions and zones for a VMware vCenter
+    File: post-install-vsphere-zones-regions-configuration
+  - Name: Enabling encryption on a vSphere cluster
+    File: vsphere-post-installation-encryption
+  - Name: Configuring the vSphere connection settings after an installation
+    File: installing-vsphere-post-installation-configuration
 - Name: Installing on any platform
   Dir: installing_platform_agnostic
   Distros: openshift-origin,openshift-enterprise
@@ -621,10 +630,6 @@ Topics:
     File: multi-architecture-compute-managing
   - Name: Managing workloads on multi-architecture clusters by using the Multiarch Tuning Operator
     File: multiarch-tuning-operator
-- Name: Enabling encryption on a vSphere cluster
-  File: vsphere-post-installation-encryption
-- Name: Configuring the vSphere connection settings after an installation
-  File: installing-vsphere-post-installation-configuration
 - Name: Cluster tasks
   File: cluster-tasks
 - Name: Node tasks
@@ -648,11 +653,6 @@ Topics:
   Distros: openshift-origin,openshift-enterprise
 - Name: Configuring additional devices in an IBM Z or IBM LinuxONE environment
   File: ibmz-post-install
-- Name: Regions and zones for a VMware vCenter
-  File: post-install-vsphere-zones-regions-configuration
-- Name: AWS Local Zone or Wavelength Zone tasks
-  File: aws-compute-edge-zone-tasks
-  Distros: openshift-enterprise
 ---
 Name: Updating clusters
 Dir: updating
@@ -1955,25 +1955,48 @@ Topics:
     Distros: openshift-origin
 - Name: Cluster Operators reference
   File: operator-reference
-- Name: OLM 1.0 (Technology Preview)
+- Name: OLM v1 (Technology Preview)
   Dir: olm_v1
   Distros: openshift-origin,openshift-enterprise
   Topics:
-  - Name: About OLM 1.0
+  - Name: About OLM v1
     File: index
-  - Name: Components and architecture
-    Dir: arch
-    Topics:
-    - Name: Components overview
-      File: olmv1-components
-    - Name: Operator Controller
-      File: olmv1-operator-controller
-    - Name: RukPak
-      File: olmv1-rukpak
-    - Name: Catalogd
-      File: olmv1-catalogd
-  - Name: Installing an Operator from a catalog
-    File: olmv1-installing-an-operator-from-a-catalog
+---
+Name: Extensions (OLM v1)
+Dir: extensions
+Distros: openshift-enterprise,openshift-origin
+Topics:
+- Name: Extensions overview
+  File: index
+- Name: Architecture
+  Dir: arch
+  Topics:
+  - Name: Components overview
+    File: components
+  - Name: Operator Controller
+    File: operator-controller
+  - Name: Catalogd
+    File: catalogd
+- Name: Common terms
+  File: of-terms
+- Name: Catalogs
+  Dir: catalogs
+  Topics:
+  - Name: File-based catalogs
+    File: fbc
+  - Name: Red Hat-provided catalogs
+    File: rh-catalogs
+  - Name: Managing catalogs
+    File: managing-catalogs
+  - Name: Creating catalogs
+    File: creating-catalogs
+- Name: Cluster extensions
+  Dir: ce
+  Topics:
+  - Name: Managing extensions
+    File: managing-ce
+  - Name: Upgrade edges
+    File: upgrade-edges
 ---
 Name: CI/CD
 Dir: cicd
@@ -2234,8 +2257,6 @@ Topics:
   Dir: creating_machinesets
   Distros: openshift-origin,openshift-enterprise
   Topics:
-  - Name: Creating a compute machine set on Alibaba Cloud
-    File: creating-machineset-alibaba
   - Name: Creating a compute machine set on AWS
     File: creating-machineset-aws
   - Name: Creating a compute machine set on Azure
@@ -2365,6 +2386,8 @@ Topics:
     File: hcp-cli
   - Name: Distributing hosted cluster workloads
     File: hcp-distribute-workloads
+  - Name: Enabling or disabling the hosted control planes feature
+    File: hcp-enable-disable
 - Name: Deploying hosted control planes
   Dir: hcp-deploy
   Topics:
@@ -2437,6 +2460,8 @@ Topics:
     File: hcp-destroy-virt
   - Name: Destroying a hosted cluster on IBM Z
     File: hcp-destroy-ibmz
+- Name: Manually importing a hosted control plane cluster
+  File: hcp-import
 ---
 Name: Nodes
 Dir: nodes
@@ -3279,6 +3304,10 @@ Topics:
       File: installing-oadp-ocs
     - Name: Configuring OADP with OpenShift Virtualization
       File: installing-oadp-kubevirt
+    - Name: Configuring OADP with multiple backup storage locations
+      File: configuring-oadp-multiple-bsl
+    - Name: Configuring OADP with multiple Volume Snapshot Locations
+      File: configuring-oadp-multiple-vsl
   - Name: Uninstalling OADP
     Dir: installing
     Topics:

_topic_maps/_topic_map_ms.yml

@@ -55,12 +55,17 @@ Topics:
 - Name: Troubleshooting installation issues
   File: microshift-installing-troubleshooting
 ---
+Name: Installing with RHEL image mode
+Dir: microshift_install_bootc
+Distros: microshift
+Topics:
+- Name: Installing with RHEL image mode
+  File: microshift-install-rhel-image-mode
+---
 Name: Updating
 Dir: microshift_updating
 Distros: microshift
 Topics:
-- Name: About updates
-  File: microshift-about-updates
 - Name: Update options
   File: microshift-update-options
 - Name: Updates with rpm-ostree systems
@@ -380,8 +385,10 @@ Name: Configuring
 Dir: microshift_configuring
 Distros: microshift
 Topics:
-- Name: Using configuration tools
+- Name: Using the MicroShift configuration file
   File: microshift-using-config-tools
+- Name: Configuring IPv6 networking
+  File: microshift-nw-ipv6-config
 - Name: Cluster access with kubeconfig
   File: microshift-cluster-access-kubeconfig
 - Name: Using custom certificate authorities
@@ -390,6 +397,8 @@ Topics:
   File: microshift-greenboot-checking-status
 - Name: Configuring audit logging policies
   File: microshift-audit-logs-config
+- Name: Workload partitioning
+  File: microshift-workload-partitioning
 ---
 Name: Networking
 Dir: microshift_networking
@@ -504,3 +513,5 @@ Topics:
   File: microshift-etcd-troubleshoot
 - Name: Additional information
   File: microshift-things-to-know
+- Name: Data cleanup
+  File: microshift-cleanup-data

_topic_maps/_topic_map_osd.yml

@@ -362,12 +362,6 @@ Topics:
     File: osd-managing-worker-nodes
   - Name: About autoscaling nodes on a cluster
     File: osd-nodes-about-autoscaling-nodes
-- Name: Logging
-  Dir: osd_logging
-  Distros: openshift-dedicated
-  Topics:
-  - Name: Accessing the service logs
-    File: osd-accessing-the-service-logs
 ---
 Name: Security and compliance
 Dir: security
@@ -820,6 +814,8 @@ Name: Networking
 Dir: networking
 Distros: openshift-dedicated
 Topics:
+- Name: About networking
+  File: about-managed-networking
 - Name: Understanding the DNS Operator
   File: dns-operator
 - Name: Understanding the Ingress Operator
@@ -850,6 +846,11 @@ Topics:
       File: deleting-network-policy
     - Name: Configuring multitenant isolation with network policy
       File: multitenant-network-policy
+- Name: OVN-Kubernetes network plugin
+  Dir: ovn_kubernetes_network_provider
+  Topics:
+  - Name: About the OpenShift SDN network plugin
+    File: about-ovn-kubernetes
 - Name: Configuring Routes
   Dir: routes
   Topics:
@@ -1256,8 +1257,6 @@ Topics:
       File: cluster-logging-dashboards
     - Name: Log visualization with Kibana
       File: logging-kibana
-  - Name: Accessing the service logs
-    File: sd-accessing-the-service-logs
   - Name: Configuring your Logging deployment
     Dir: config
     Topics: