Merge pull request #64712 from agantony/ROX18476-main

Author: kcarmichael08

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

@@ -138,13 +138,13 @@ AddType text/vtt                            vtt
     # ACS Redirects to go to the latest version - change here when a new version drops
     # it should probably be best to combine the next few lines in one reg exp but for clarity keeping them separate
     # the first one redirects
-    RewriteRule ^acs/?$ /acs/4.1/welcome/index.html [R=301]
+    RewriteRule ^acs/?$ /acs/4.2/welcome/index.html [R=301]
     # redirect to the latest release notes
-    RewriteRule ^acs/release_notes/?$ /acs/4.1/release_notes/41-release-notes.html [R=301,NE]
+    RewriteRule ^acs/release_notes/?$ /acs/4.2/release_notes/42-release-notes.html [R=301,NE]
     # redirect from ACS CLoud Service page
-    RewriteRule ^acs/installing/install-ocp-operator.html /acs/4.1/installing/installing_ocp/init-bundle-ocp.html [NE,R=301]
-    RewriteRule ^acs/(\D.*)$ /acs/4.1/$1 [NE,R=301]
-    RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70|3\.71|3\.72|3\.73|3\.74|4\.0|4\.1)/?$ /acs/$1/welcome/index.html [L,R=301]
+    RewriteRule ^acs/installing/install-ocp-operator.html /acs/4.2/installing/installing_ocp/init-bundle-ocp.html [NE,R=301]
+    RewriteRule ^acs/(\D.*)$ /acs/4.2/$1 [NE,R=301]
+    RewriteRule ^acs/(3\.65|3\.66|3\.67|3\.68|3\.69|3\.70|3\.71|3\.72|3\.73|3\.74|4\.0|4\.1|4\.2)/?$ /acs/$1/welcome/index.html [L,R=301]
     #redirect for 4.0 Manage vulneribility page
     RewriteRule ^(acs/(?:4\.0/)?)?operating/manage-vulnerabilities\.html$ /acs/4.0/operating/manage-vulnerabilities/vulnerability-management.html [NE,R=301]
 

_distro_map.yml

@@ -277,6 +277,9 @@ openshift-acs:
     rhacs-docs-4.1:
       name: '4.1'
       dir: acs/4.1
+    rhacs-docs-4.2:
+      name: '4.2'
+      dir: acs/4.2
 microshift:
   name: MicroShift
   author: OpenShift Documentation Project <[email protected]>

_templates/_page_openshift.html.erb

@@ -168,6 +168,7 @@
               <%= distro %>
             </a>
             <select id="version-selector" onchange="versionSelector(this);">
+              <option value="4.2">4.2</option>
               <option value="4.1">4.1</option>
               <option value="4.0">4.0</option>
               <option value="3.74">3.74</option>

index-commercial.html

@@ -246,6 +246,7 @@ <h2>Red Hat Advanced Cluster Security for Kubernetes</h2>
               <div class="btn-group">
                 <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select version<span class="caret"></span></button>
                 <ul class="dropdown-menu" role="menu">
+                  <li><a href="acs/4.2/welcome/index.html"><i class="fa fa-arrow-circle-o-right"></i> RHACS 4.2</a></li>
                   <li><a href="acs/4.1/welcome/index.html"><i class="fa fa-arrow-circle-o-right"></i> RHACS 4.1</a></li>
                   <li><a href="acs/4.0/welcome/index.html"><i class="fa fa-arrow-circle-o-right"></i> RHACS 4.0</a></li>
                   <li><a href="acs/3.74/welcome/index.html"><i class="fa fa-arrow-circle-o-right"></i> RHACS 3.74</a></li>