From 93e5e1452b958657ee3006c0147820564eb8316e Mon Sep 17 00:00:00 2001
From: Kathryn Alexander <kalexand@redhat.com>
Date: Mon, 25 Jul 2022 14:13:08 -0400
Subject: [PATCH] 4.11 GA

---
 .s2i/httpd-cfg/01-commercial.conf   | 4 ++--
 _distro_map.yml                     | 4 ++--
 _templates/_page_openshift.html.erb | 1 +
 index-commercial.html               | 6 +++++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf
index 46e9fe1dcb..c94d580ade 100644
--- a/.s2i/httpd-cfg/01-commercial.conf
+++ b/.s2i/httpd-cfg/01-commercial.conf
@@ -152,7 +152,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\.10/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.11/$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
@@ -431,7 +431,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)/?$ /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)/?$ /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]
 
 
diff --git a/_distro_map.yml b/_distro_map.yml
index 997950f71c..152c53de1b 100644
--- a/_distro_map.yml
+++ b/_distro_map.yml
@@ -138,7 +138,7 @@ openshift-dedicated:
     enterprise-3.11:
       name: '3'
       dir: dedicated/3
-    enterprise-4.10:
+    enterprise-4.11:
       name: ''
       dir: dedicated/
 openshift-aro:
@@ -161,7 +161,7 @@ openshift-rosa:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.10:
+    enterprise-4.11:
       name: ''
       dir: rosa/
     rosa-preview:
diff --git a/_templates/_page_openshift.html.erb b/_templates/_page_openshift.html.erb
index 570d13f271..2fc75a1ee4 100644
--- a/_templates/_page_openshift.html.erb
+++ b/_templates/_page_openshift.html.erb
@@ -97,6 +97,7 @@
             </a>
           <% end %>
           <select id="version-selector" onchange="versionSelector(this);">
+              <option value="4.11">4.11</option>
               <option value="4.10">4.10</option>
               <option value="4.9">4.9</option>
               <option value="4.8">4.8</option>
diff --git a/index-commercial.html b/index-commercial.html
index 832adfe77a..4a0c4cc135 100644
--- a/index-commercial.html
+++ b/index-commercial.html
@@ -178,6 +178,7 @@
               <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.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>
                   <li><a href="container-platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.9</a></li>
                   <li><a href="container-platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.8</a></li>
@@ -288,7 +289,7 @@
           <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.10/welcome/oke_about.html">OKE</a>.
+            Read more about <a href="/container-platform/4.11/welcome/oke_about.html">OKE</a>.
           </div>
 
         </div>
@@ -303,6 +304,7 @@
             <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.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>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> 4.9</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> 4.8</a></li>
@@ -321,6 +323,7 @@
             <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.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>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> 4.9</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> 4.8</a></li>
@@ -339,6 +342,7 @@
             <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.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>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> 4.9</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.8/"><i class="fa fa-arrow-circle-o-right"></i> 4.8</a></li>