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

dtotel-docs-3.3 branch update

Author: kalexand-rh

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "image":"mcr.microsoft.com/devcontainers/universal:2",
-  "postCreateCommand": "sleep 30 && docker run --rm -it -v `pwd`:/docs:Z quay.io/openshift-cs/asciibinder sh -c \"git config --global --add safe.directory /docs && asciibinder build --distro openshift-rosa && asciibinder build --distro openshift-enterprise\" && python3 -m http.server -d ./_preview",
+  "postCreateCommand": "sleep 60  && docker run --rm -it -v `pwd`:/docs:Z quay.io/openshift-cs/asciibinder sh -c \"git config --global --add safe.directory /docs && asciibinder build --distro openshift-rosa && asciibinder build --distro openshift-enterprise\" && python3 -m http.server -d ./_preview",
   "customizations": {
     "vscode": {
       "settings": {

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

@@ -153,8 +153,10 @@ AddType text/vtt                            vtt
     RewriteRule ^(acs/(?:4\.4/)?)?installing/acs-installation-platforms\.html$ /acs/4.4/installing/acs-high-level-overview.html [NE,R=301]
     #redirect Architecture page for ACS Cloud into Cloud directory
     RewriteRule ^acs/(4\.4)/architecture/acscs-architecture\.html$ /acs/latest/cloud_service/acscs-architecture.html [NE,R=302]
+    #redirect Managing compliance and Compliance Operator pages as per https://github.com/openshift/openshift-docs/pull/78035
+    RewriteRule ^acs/(4\.5)/operating/manage-compliance-operator/compliance-operator-rhacs\.html$ /acs/latest/operating/compliance-operator-rhacs.html [NE,R=302]
 
-      # remove aro docs to just the welcome page
+    #remove aro docs to just the welcome page
     RewriteRule aro/4/(?!welcome)(.*)?$ /container-platform/latest/$1 [L,R=301]
 
     # Redirects for "latest" version
@@ -229,6 +231,17 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(4\.12|4\.13)/scalability_and_performance/low_latency_tuning/cnf-tuning-low-latency-nodes-with-perf-profile.html /container-platform/$1/scalability_and_performance/cnf-low-latency-tuning.html [NE,R=302]
     RewriteRule ^container-platform/(4\.12|4\.13)/scalability_and_performance/low_latency_tuning/cnf-provisioning-low-latency-workloads.html /container-platform/$1/scalability_and_performance/cnf-low-latency-tuning.html [NE,R=302]
 
+    #Install redirects per https://github.com/openshift/openshift-docs/pull/79711
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/index.html /container-platform/$1/installing/overview/index.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-preparing.html /container-platform/$1/installing/overview/installing-preparing.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/cluster-capabilities.html /container-platform/$1/installing/overview/cluster-capabilities.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-fips.html /container-platform/$1/installing/overview/installing-fips.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/validating-an-installation.html /container-platform/$1/installing/validation_and_troubleshooting/validating-an-installation.html [NE,R=302]
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/installing/installing-troubleshooting.html /container-platform/$1/installing/validation_and_troubleshooting/installing-troubleshooting.html [NE,R=302]
+
+
+    # ingress sharding redirect per https://github.com/openshift/openshift-docs/pull/76916
+    RewriteRule ^container-platform/(4\.1[2-6]|latest)/networking/ingress-sharding.html /container-platform/$1/networking/configuring_ingress_cluster_traffic/configuring-ingress-cluster-traffic-ingress-controller.html [NE,R=302]
 
     # Redirects for new ZTP edge computing section
     RewriteRule ^container-platform/(4\.15|4\.16)/scalability_and_performance/ztp_far_edge/cnf-talm-for-cluster-upgrades.html /container-platform/$1/edge_computing/cnf-talm-for-cluster-upgrades.html [NE,R=302]
@@ -349,6 +362,16 @@ AddType text/vtt                            vtt
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/collecting-debugging-data-for-support.html /gitops/latest/understanding_openshift_gitops/gathering-gitops-diagnostic-information-for-support.html [L,R=302]
     RewriteRule ^container-platform/(4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/cicd/gitops/troubleshooting-issues-in-GitOps.html /gitops/latest/troubleshooting_gitops_issues/auto-reboot-during-argo-cd-sync-with-machine-configurations.html [L,R=302]
 
+
+# Lightspeed handling unversioned and latest links
+    RewriteRule ^lightspeed/?$ /lightspeed/latest [R=302]
+    RewriteRule ^lightspeed/latest/?(.*)$ /lightspeed/1\.0tp1/$1 [NE,R=302]
+
+    # Lightspeed landing page
+
+    RewriteRule ^container-platform/(4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18)/lightspeed/about/ols-openshift-lightspeed-overview.html /lightspeed/latest/about/ols-about-openshift-lightspeed.html [NE,R=302]
+
+
     # Pipelines handling unversioned and latest links
     RewriteRule ^pipelines/?$ /pipelines/latest [R=302]
     RewriteRule ^pipelines/latest/?(.*)$ /pipelines/1\.15/$1 [NE,R=302]

404-commercial.html

@@ -167,7 +167,7 @@ <h1>Not found</h1>
     <div class="container">
         <div class="row">
             <div class="col-sm-2">
-                <img src="https://assets.openshift.com/hubfs/images/logos/Logo-RedHat-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
+                <img src="https://assets.openshift.net/content/img/Logo-Red_Hat-OpenShift-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
             </div>
 
             <div class="col-sm-3">

OWNERS-ALIASES

@@ -6,6 +6,8 @@
 :OCP: OpenShift Container Platform
 :ocp-version: 4.17
 :oc-first: pass:quotes[OpenShift CLI (`oc`)]
+//OpenShift Kubernetes Engine
+:oke: OpenShift Kubernetes Engine
 :product-title-first: Red Hat build of MicroShift (MicroShift)
 :microshift-short: MicroShift
 :product-registry: OpenShift image registry

_attributes/attributes-microshift.adoc

@@ -47,11 +47,7 @@ endif::[]
 :rh-rhacm-first: Red Hat Advanced Cluster Management (RHACM)
 :rh-rhacm: RHACM
 :rh-rhacm-version: 2.11
-:sandboxed-containers-first: OpenShift sandboxed containers
-:sandboxed-containers-operator: OpenShift sandboxed containers Operator
-:sandboxed-containers-version: 1.5
-:sandboxed-containers-version-z: 1.5.0
-:sandboxed-containers-legacy-version: 1.4.1
+:osc: OpenShift sandboxed containers
 :cert-manager-operator: cert-manager Operator for Red Hat OpenShift
 :secondary-scheduler-operator-full: Secondary Scheduler Operator for Red Hat OpenShift
 :secondary-scheduler-operator: Secondary Scheduler Operator
@@ -136,6 +132,9 @@ ifdef::telco-core[]
 :rds: telco core
 :rds-caps: Telco core
 endif::[]
+//lightspeed
+:ols-official: Red Hat OpenShift Lightspeed
+:ols: OpenShift Lightspeed
 //logging
 :logging: logging
 :logging-uc: Logging
@@ -168,8 +167,8 @@ endif::[]
 :product-rosa: Red Hat OpenShift Service on AWS
 :SMProductName: Red Hat OpenShift Service Mesh
 :SMProductShortName: Service Mesh
-:SMProductVersion: 2.5.2
-:MaistraVersion: 2.5
+:SMProductVersion: 2.6.0
+:MaistraVersion: 2.6
 :KialiProduct: Kiali Operator provided by Red Hat
 :SMPlugin: OpenShift Service Mesh Console (OSSMC) plugin
 :SMPluginShort: OSSMC plugin

_attributes/common-attributes.adoc

@@ -424,3 +424,13 @@ openshift-lightspeed:
     lightspeed-docs-1.0tp1:
       name: '1.0tp1'
       dir: lightspeed/1.0tp1
+openshift-service-mesh:
+  name: Red Hat OpenShift Service Mesh
+  author: OpenShift documentation team <[email protected]>
+  site: commercial
+  site_name: Documentation
+  site_url: https://docs.openshift.com/
+  branches:
+    service-mesh-docs-3.0.0tp1:
+      name: '3.0tp1'
+      dir: service-mesh/3.0.0tp1

_distro_map.yml

@@ -24,14 +24,10 @@
     <div class="row">
       <div class="col-xs-12 col-sm-4">
         <a id="footer_logo" href="https://www.redhat.com/">
-          <img alt="Red Hat" src="https://assets.openshift.com/hubfs/images/logos/Logo-RedHat-A-Reverse-RGB.svg" style="width: 128px">
-        </a>
-      </div>
-      <div class="col-xs-12 col-sm-4 text-center">
-        <a id="powered_by_openshift" title="Powered by OpenShift Online" href="https://www.openshift.com/">
-          <img src="https://www.openshift.com/images/logos/powered_by_openshift_reverse.png" alt="Powered by OpenShift Online">
+          <img alt="Red Hat" src="https://assets.openshift.net/content/img/Logo-Red_Hat-OpenShift-A-Reverse-RGB.svg" style="width: 128px">
         </a>
       </div>
+      <div class="col-xs-12 col-sm-4 text-center"></div>
       <div class="col-xs-12 col-sm-4 text-right">
         <a id="built_with_asciibinder" title="Built with AsciiBinder docs management system" href="https://github.com/redhataccess/ascii_binder/">
           <img src="<%= File.join(images_path, 'asciibinder_web_logo.svg') %>" alt="AsciiBinder">

_templates/_footer_origin.html.erb

@@ -4,7 +4,7 @@
         <div class="row">
 
             <div class="col-sm-2">
-                <img src="https://assets.openshift.com/hubfs/images/logos/Logo-RedHat-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
+                <img src="https://assets.openshift.net/content/img/Logo-Red_Hat-OpenShift-A-Reverse-RGB.svg" class="img-fluid" alt="Red Hat" style="height: 30px;">
             </div>
 
             <div class="col-sm-3">

_templates/_footer_other.html.erb

@@ -67,6 +67,14 @@
       </span>
       <% end %>
 
+      <% if (distro_key == "openshift-lightspeed") %>
+      <span>
+        <div class="alert alert-danger" role="alert" id="support-alert">
+          <strong>OpenShift Lightspeed is a Developer Preview release. Developer Preview features are not supported by Red Hat in any way and are not functionally complete or production-ready. Do not use Developer Preview features for production or business-critical workloads. Developer Preview features provide early access to upcoming product features in advance of their possible inclusion in a Red Hat product offering, enabling customers to test functionality and provide feedback during the development process. These features might not have any documentation, are subject to change or removal at any time, and testing is limited. Red Hat might provide ways to submit feedback on Developer Preview features without an associated SLA. This documentation is a work in progress and might not be complete or fully tested.</strong></a>.
+        </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">
@@ -256,6 +264,13 @@
               <option value="1.9">1.9</option>
               <option value="1.8">1.8</option>
             </select>
+        <% elsif (distro_key == "openshift-lightspeed") %>
+            <a href="https://docs.openshift.com/lightspeed/<%= version %>/about/ols-about-openshift-lightspeed.html">
+              <%= distro %>
+            </a>
+            <select id="version-selector" onchange="versionSelector(this);">
+              <option value="1.0tp1">1.0tp1</option>
+            </select>
         <% elsif (distro_key == "openshift-telco") %>
             <a href="https://docs.openshift.com/container-platform-telco/<%= version %>/welcome/index.html">
               <%= distro %>
@@ -299,7 +314,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") %>
+      <% 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") %>
       <span text-align="right" style="float: right !important">
         <a href="https://github.com/openshift/openshift-docs/commits/<%=
         ((distro_key == "openshift-enterprise") ? "enterprise-#{version}"
@@ -496,7 +511,8 @@
     'openshift-serverless' : ['docs_serverless', version],
     'openshift-pipelines' : ['docs_pipelines', version],
     'openshift-builds' : ['docs_builds', version],
-    'openshift-gitops' : ['docs_gitops', version]
+    'openshift-gitops' : ['docs_gitops', version],
+    'openshift-lightspeed' : ['docs_lightspeed', version]
   };
 
   // only OSD v3 docs have the version variable specified