Merge pull request #100775 from kalexand-rh/4.20-GA

4.20 GA

Author: kalexand-rh

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

@@ -164,7 +164,7 @@ AddType text/vtt                            vtt
 
     # Redirects for "latest" version
     RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
-    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.19/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.20/$2 [NE,R=301]
     RewriteRule ^(online)/(3\.0|3\.1|3\.2|3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|latest)/?(.*)$ /$1/pro/$3 [NE,R=301]
 
     # Release notes redirects
@@ -791,7 +791,7 @@ AddType text/vtt                            vtt
     RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
     RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
-    RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18|4\.19)/?$ /container-platform/$1/welcome/index.html [L,R=301]
+    RewriteRule ^container-platform/(3\.3|3\.4|3\.5|3\.6|3\.7|3\.9|3\.10|3\.11|4\.1|4\.2|4\.3|4\.4|4\.5|4\.6|4\.7|4\.8|4\.9|4\.10|4\.11|4\.12|4\.13|4\.14|4\.15|4\.16|4\.17|4\.18|4\.19|4\.20)/?$ /container-platform/$1/welcome/index.html [L,R=301]
     RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
 
 

_distro_map.yml

@@ -51,6 +51,9 @@ openshift-origin:
     enterprise-4.19:
       name: '4.19'
       dir: '4.19'
+    enterprise-4.20:
+      name: '4.20'
+      dir: '4.20'
     enterprise-3.6:
       name: '3.6'
       dir: '3.6'
@@ -172,6 +175,9 @@ openshift-enterprise:
     enterprise-4.20:
       name: '4.20'
       dir: container-platform/4.20
+    enterprise-4.21:
+      name: '4.21'
+      dir: container-platform/4.21
 openshift-dedicated:
   name: OpenShift Dedicated
   author: OpenShift Documentation Project <openshift-docs@redhat.com>
@@ -182,7 +188,7 @@ openshift-dedicated:
     enterprise-3.11:
       name: '3'
       dir: dedicated/3
-    enterprise-4.19:
+    enterprise-4.20:
       name: ''
       dir: dedicated/
 openshift-aro:
@@ -205,7 +211,7 @@ openshift-rosa:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.19:
+    enterprise-4.20:
       name: ''
       dir: rosa/
     rosa-preview:
@@ -218,7 +224,7 @@ openshift-rosa-hcp:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.19:
+    enterprise-4.20:
       name: ''
       dir: rosa-hcp/
     rosa-preview:
@@ -231,7 +237,7 @@ openshift-rosa-portal:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.19:
+    enterprise-4.20:
       name: ''
       dir: rosa-portal/
 openshift-webscale:

contributing_to_docs/doc_guidelines.adoc

@@ -545,22 +545,22 @@ possible values for `{product-title}` and `{product-version}`, depending on the
 |`openshift-origin`
 |OKD
 a|* 3.6, 3.7, 3.9, 3.10, 3.11
-* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19
+* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20
 * 4 for the `latest/` build from the `main` branch
 
 |`openshift-enterprise`
 |OpenShift Container Platform
 a|* 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11
-* 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20
+* 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20, 4.21
 
 |`openshift-dedicated`
 |OpenShift Dedicated
-a|* No value set for the latest `dedicated/` build from the `enterprise-4.19` branch
+a|* No value set for the latest `dedicated/` build from the `enterprise-4.20` branch
 * 3 for the `dedicated/3` build from the `enterprise-3.11` branch
 
 |`openshift-rosa`
 |Red Hat OpenShift Service on AWS
-|No value set for the `rosa/` build from the `enterprise-4.19` branch
+|No value set for the `rosa/` build from the `enterprise-4.20` branch
 
 |`openshift-online`
 |OpenShift Online

index-community.html

@@ -51,6 +51,7 @@ <h1 class="cover-heading">Documentation</h1>
              <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="latest/"><i class="fa fa-arrow-circle-o-right"></i> OKD Latest</a></li>
+               <li><a href="4.20/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.20</a></li>
                <li><a href="4.19/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.19</a></li>
                <li><a href="4.18/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.18</a></li>
                <li><a href="4.17/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.17</a></li>