Merge pull request #59962 from kalexand-rh/413GA

4.13 GA

Author: kalexand-rh

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

@@ -156,7 +156,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\.12/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.13/$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
@@ -459,7 +459,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)/?$ /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)/?$ /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]
 
 

.travis.yml

@@ -18,9 +18,9 @@ jobs:
         - pip3 install pyyaml
         - pip3 install aura.tar.gz
       script:
-        - python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.12 --no-upstream-fetch && python3 makeBuild.py
+        - python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.13 --no-upstream-fetch && python3 makeBuild.py
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.12, enterprise-4.13)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build openshift-dedicated distro"
       before_install:
         - gem install asciidoctor
@@ -31,7 +31,7 @@ jobs:
       script:
         - python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch && python3 makeBuild.py
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.12, enterprise-4.13)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build openshift-rosa distro"
       before_install:
         - gem install asciidoctor
@@ -42,7 +42,7 @@ jobs:
       script:
         - python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch && python3 makeBuild.py
     - # stage name not required, will continue to use `build`
-      if: branch IN (main, enterprise-4.12, enterprise-4.13)
+      if: branch IN (main, enterprise-4.13, enterprise-4.14)
       name: "Build microshift distro"
       before_install:
         - gem install asciidoctor

_distro_map.yml

@@ -30,6 +30,9 @@ openshift-origin:
     enterprise-4.12:
       name: '4.12'
       dir: '4.12'
+    enterprise-4.13:
+      name: '4.13'
+      dir: '4.13'
     enterprise-3.6:
       name: '3.6'
       dir: '3.6'
@@ -140,6 +143,9 @@ openshift-enterprise:
     enterprise-4.13:
       name: '4.13'
       dir: container-platform/4.13
+    enterprise-4.14:
+      name: '4.14'
+      dir: container-platform/4.14
 openshift-dedicated:
   name: OpenShift Dedicated
   author: OpenShift Documentation Project <[email protected]>
@@ -150,7 +156,7 @@ openshift-dedicated:
     enterprise-3.11:
       name: '3'
       dir: dedicated/3
-    enterprise-4.12:
+    enterprise-4.13:
       name: ''
       dir: dedicated/
 openshift-aro:
@@ -173,12 +179,9 @@ openshift-rosa:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.12:
-      name: ''
-      dir: rosa/
     enterprise-4.13:
       name: ''
-      dir: rosa-hcp
+      dir: rosa/
     rosa-preview:
       name: ''
       dir: rosa-preview/

_templates/_page_openshift.html.erb

@@ -59,7 +59,7 @@
       </span>
       <% end %>
 
-      <% if (version == "4.13") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
+      <% if (version == "4.14") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
       <span>
         <div class="alert alert-danger" role="alert" id="support-alert">
           <strong>This documentation is a work in progress that aligns to preview releases of the next pending OpenShift Container Platform version 4 minor release. It might not be complete or fully tested, and some features and content might be removed before the next release. </strong>For the most recent released and supported version, see <a href="https://docs.openshift.com/container-platform/latest/welcome/index.html" style="color: #545454 !important" class="link-primary">[4]</a>.
@@ -113,6 +113,7 @@
             </a>
           <% end %>
           <select id="version-selector" onchange="versionSelector(this);">
+              <option value="4.13">4.13</option>
               <option value="4.12">4.12</option>
               <option value="4.11">4.11</option>
               <option value="4.10">4.10</option>
@@ -162,6 +163,7 @@
               </a>
               <select id="version-selector" onchange="versionSelector(this);">
                 <option value="latest">latest</option>
+                <option value="4.13">4.13</option>
                 <option value="4.12">4.12</option>
                 <option value="4.11">4.11</option>
                 <option value="4.10">4.10</option>

contributing_to_docs/doc_guidelines.adoc

@@ -488,22 +488,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.8, 4.9, 4.10, 4.11, 4.12, 4.13
 * 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.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
 
 |`openshift-dedicated`
 |OpenShift Dedicated
-a|* No value set for the latest `dedicated/` build from the `enterprise-4.12` branch
+a|* No value set for the latest `dedicated/` build from the `enterprise-4.13` 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.12` branch
+|No value set for the `rosa/` build from the `enterprise-4.13` branch
 
 |`openshift-online`
 |OpenShift Online

index-commercial.html

@@ -178,6 +178,7 @@ <h2>OpenShift Container Platform</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="container-platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.13</a></li>
                   <li><a href="container-platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.12</a></li>
                   <li><a href="container-platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.11</a></li>
                   <li><a href="container-platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.10</a></li>
@@ -295,7 +296,7 @@ <h2>OpenShift Online</h2>
           <h2>OpenShift Kubernetes Engine</h2>
           <div class="list-group">
             <p class="list-group-item-text">The OpenShift Kubernetes Engine is the core of the OpenShift Container Platform. Use OpenShift Container Platform docs links for OpenShift Kubernetes Engine documentation.</p>
-            Read more about <a href="/container-platform/4.12/welcome/oke_about.html">OKE</a>.
+            Read more about <a href="/container-platform/4.13/welcome/oke_about.html">OKE</a>.
           </div>
 
         </div>
@@ -310,6 +311,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
             <div class="btn-group">
               <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
               <ul class="dropdown-menu" role="menu">
+                <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> 4.13</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> 4.12</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> 4.11</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> 4.10</a></li>
@@ -330,6 +332,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
             <div class="btn-group">
               <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
               <ul class="dropdown-menu" role="menu">
+                <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> 4.13</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> 4.12</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> 4.11</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> 4.10</a></li>
@@ -350,6 +353,7 @@ <h2>OpenShift Container Platform <font size="-1">(한국어 문서)</font></h2>
             <div class="btn-group">
               <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">버전 선택<span class="caret"></span></button>
               <ul class="dropdown-menu" role="menu">
+                <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> 4.13</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> 4.12</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> 4.11</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> 4.10</a></li>

index-community.html

@@ -50,6 +50,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.13/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.13</a></li>
                <li><a href="4.12/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.12</a></li>
                <li><a href="4.11/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.11</a></li>
                <li><a href="4.10/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.10</a></li>