Merge pull request #82666 from kalexand-rh/417GA

kalexand-rh · web-flow · commit e5ff1ea870b9 · 2024-10-01T14:18:34.000-04:00
4.17 GA
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
- @abhatt-rh @abrennan89 @adellape @aireilly @apinnick @bburt-rh @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @kelbrown20 @michaelryanpeter @mjpytlak @opayne1 @ousleyp @rolfedh @sjhala-ccs @snarayan-redhat @Srivaralakshmi
+ @abhatt-rh @abrennan89 @adellape @aireilly @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @michaelryanpeter @opayne1 @ousleyp @sjhala-ccs @snarayan-redhat @Srivaralakshmi
diff --git a/.s2i/httpd-cfg/01-commercial.conf b/.s2i/httpd-cfg/01-commercial.conf
@@ -161,7 +161,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\.16/$2 [NE,R=301]
+    RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.17/$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
@@ -687,7 +687,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)/?$ /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)/?$ /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
@@ -42,6 +42,9 @@ openshift-origin:
     enterprise-4.16:
       name: '4.16'
       dir: '4.16'
+    enterprise-4.17:
+      name: '4.17'
+      dir: '4.17'
     enterprise-3.6:
       name: '3.6'
       dir: '3.6'
@@ -154,6 +157,9 @@ openshift-enterprise:
     enterprise-4.17:
       name: '4.17'
       dir: container-platform/4.17
+    enterprise-4.18:
+      name: '4.18'
+      dir: container-platform/4.18
 openshift-dedicated:
   name: OpenShift Dedicated
   author: OpenShift Documentation Project <openshift-docs@redhat.com>
@@ -164,7 +170,7 @@ openshift-dedicated:
     enterprise-3.11:
       name: '3'
       dir: dedicated/3
-    enterprise-4.16:
+    enterprise-4.17:
       name: ''
       dir: dedicated/
 openshift-aro:
@@ -187,7 +193,7 @@ openshift-rosa:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.16:
+    enterprise-4.17:
       name: ''
       dir: rosa/
     rosa-preview:
@@ -200,7 +206,7 @@ openshift-rosa-hcp:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.16:
+    enterprise-4.17:
       name: ''
       dir: rosa-hcp/
     rosa-preview:
@@ -213,7 +219,7 @@ openshift-rosa-portal:
   site_name: Documentation
   site_url: https://docs.openshift.com/
   branches:
-    enterprise-4.16:
+    enterprise-4.17:
       name: ''
       dir: rosa-portal/
 openshift-webscale:
diff --git a/_templates/_page_openshift.html.erb b/_templates/_page_openshift.html.erb
@@ -83,7 +83,7 @@
       </span>
       <% end %>
 
-      <% if (version == "4.17") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu" && distro_key != "rosa-hcp") %>
+      <% if (version == "4.18") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu" && distro_key != "rosa-hcp") %>
       <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>.
@@ -179,6 +179,7 @@
             </a>
           <% end %>
           <select id="version-selector" onchange="versionSelector(this);">
+              <option value="4.17">4.17</option>
               <option value="4.16">4.16</option>
               <option value="4.15">4.15</option>
               <option value="4.14">4.14</option>
@@ -302,6 +303,7 @@
             </a>
             <select id="version-selector" onchange="versionSelector(this);">
               <option value="latest">latest</option>
+              <option value="4.17">4.17</option>
               <option value="4.16">4.16</option>
               <option value="4.15">4.15</option>
               <option value="4.14">4.14</option>
diff --git a/contributing_to_docs/doc_guidelines.adoc b/contributing_to_docs/doc_guidelines.adoc
@@ -603,22 +603,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.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17
 * 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.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
 
 |`openshift-dedicated`
 |OpenShift Dedicated
-a|* No value set for the latest `dedicated/` build from the `enterprise-4.16` branch
+a|* No value set for the latest `dedicated/` build from the `enterprise-4.17` 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.16` branch
+|No value set for the `rosa/` build from the `enterprise-4.17` branch
 
 |`openshift-online`
 |OpenShift Online
diff --git a/index-commercial.html b/index-commercial.html
@@ -173,6 +173,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.17/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.17</a></li>
                   <li><a href="container-platform/4.16/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.16</a></li>
                   <li><a href="container-platform/4.15/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.15</a></li>
                   <li><a href="container-platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.14</a></li>
@@ -268,7 +269,7 @@ <h2>Red Hat Advanced Cluster Security for Kubernetes</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.16/welcome/oke_about.html">OKE</a>.
+            Read more about <a href="/container-platform/4.17/welcome/oke_about.html">OKE</a>.
           </div>
           </div>
         </div>
@@ -281,6 +282,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.17/"><i class="fa fa-arrow-circle-o-right"></i> 4.17</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.16/"><i class="fa fa-arrow-circle-o-right"></i> 4.16</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.15/"><i class="fa fa-arrow-circle-o-right"></i> 4.15</a></li>
                 <li><a href="https://access.redhat.com/documentation/ja-jp/openshift_container_platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> 4.14</a></li>
@@ -305,6 +307,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.17/"><i class="fa fa-arrow-circle-o-right"></i> 4.17</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.16/"><i class="fa fa-arrow-circle-o-right"></i> 4.16</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.15/"><i class="fa fa-arrow-circle-o-right"></i> 4.15</a></li>
                 <li><a href="https://access.redhat.com/documentation/zh-cn/openshift_container_platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> 4.14</a></li>
@@ -329,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/ko-kr/openshift_container_platform/4.17/"><i class="fa fa-arrow-circle-o-right"></i> 4.17</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.16/"><i class="fa fa-arrow-circle-o-right"></i> 4.16</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.15/"><i class="fa fa-arrow-circle-o-right"></i> 4.15</a></li>
                 <li><a href="https://access.redhat.com/documentation/ko-kr/openshift_container_platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> 4.14</a></li>
diff --git a/index-community.html b/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.17/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.17</a></li>
                <li><a href="4.16/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.16</a></li>
                <li><a href="4.15/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.15</a></li>
                <li><a href="4.14/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.14</a></li>

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- @abhatt-rh @abrennan89 @adellape @aireilly @apinnick @bburt-rh @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @kelbrown20 @michaelryanpeter @mjpytlak @opayne1 @ousleyp @rolfedh @sjhala-ccs @snarayan-redhat @Srivaralakshmi`
	`1`	`+ @abhatt-rh @abrennan89 @adellape @aireilly @bergerhoffer @bscott-rh @gabriel-rh @jab-rh @jeana-redhat @JoeAldinger @kalexand-rh @kcarmichael08 @michaelryanpeter @opayne1 @ousleyp @sjhala-ccs @snarayan-redhat @Srivaralakshmi`