Skip to content

Commit 331b9ae

Browse files
kalexand-rhkalexand-rh
authored
Merge pull request #71921 from kalexand-rh/415GA
4.15 GA
2 parents 1de592f + d9ca1bf commit 331b9ae

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ AddType text/vtt vtt
153153

154154
# Redirects for "latest" version
155155
RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
156-
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.14/$2 [NE,R=301]
156+
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.15/$2 [NE,R=301]
157157
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]
158158

159159
# Release notes redirects
@@ -591,7 +591,7 @@ AddType text/vtt vtt
591591
RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
592592
RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
593593
RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
594-
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)/?$ /container-platform/$1/welcome/index.html [L,R=301]
594+
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)/?$ /container-platform/$1/welcome/index.html [L,R=301]
595595
RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
596596

597597

‎_distro_map.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ openshift-origin:
3636
enterprise-4.14:
3737
name: '4.14'
3838
dir: '4.14'
39+
enterprise-4.15:
40+
name: '4.15'
41+
dir: '4.15'
3942
enterprise-3.6:
4043
name: '3.6'
4144
dir: '3.6'
@@ -152,6 +155,9 @@ openshift-enterprise:
152155
enterprise-4.15:
153156
name: '4.15'
154157
dir: container-platform/4.15
158+
enterprise-4.16:
159+
name: '4.16'
160+
dir: container-platform/4.16
155161
openshift-dedicated:
156162
name: OpenShift Dedicated
157163
author: OpenShift Documentation Project <[email protected]>
@@ -162,7 +168,7 @@ openshift-dedicated:
162168
enterprise-3.11:
163169
name: '3'
164170
dir: dedicated/3
165-
enterprise-4.14:
171+
enterprise-4.15:
166172
name: ''
167173
dir: dedicated/
168174
openshift-aro:
@@ -185,7 +191,7 @@ openshift-rosa:
185191
site_name: Documentation
186192
site_url: https://docs.openshift.com/
187193
branches:
188-
enterprise-4.14:
194+
enterprise-4.15:
189195
name: ''
190196
dir: rosa/
191197
rosa-preview:
@@ -198,7 +204,7 @@ openshift-rosa-portal:
198204
site_name: Documentation
199205
site_url: https://docs.openshift.com/
200206
branches:
201-
enterprise-4.14:
207+
enterprise-4.15:
202208
name: ''
203209
dir: rosa-portal/
204210
openshift-webscale:

‎_templates/_page_openshift.html.erb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
</span>
6969
<% end %>
7070

71-
<% if (version == "4.15") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
71+
<% if (version == "4.16") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
7272
<span>
7373
<div class="alert alert-danger" role="alert" id="support-alert">
7474
<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>.
@@ -164,6 +164,7 @@
164164
</a>
165165
<% end %>
166166
<select id="version-selector" onchange="versionSelector(this);">
167+
<option value="4.15">4.15</option>
167168
<option value="4.14">4.14</option>
168169
<option value="4.13">4.13</option>
169170
<option value="4.12">4.12</option>
@@ -253,6 +254,7 @@
253254
<%= distro %>
254255
</a>
255256
<select id="version-selector" onchange="versionSelector(this);">
257+
<option value="4.15">4.15</option>
256258
<option value="4.14">4.14</option>
257259
</select>
258260
<% elsif (distro_key == "openshift-origin") %>
@@ -261,6 +263,7 @@
261263
</a>
262264
<select id="version-selector" onchange="versionSelector(this);">
263265
<option value="latest">latest</option>
266+
<option value="4.15">4.15</option>
264267
<option value="4.14">4.14</option>
265268
<option value="4.13">4.13</option>
266269
<option value="4.12">4.12</option>

‎contributing_to_docs/doc_guidelines.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,22 +506,22 @@ possible values for `{product-title}` and `{product-version}`, depending on the
506506
|`openshift-origin`
507507
|OKD
508508
a|* 3.6, 3.7, 3.9, 3.10, 3.11
509-
* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14
509+
* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15
510510
* 4 for the `latest/` build from the `main` branch
511511

512512
|`openshift-enterprise`
513513
|OpenShift Container Platform
514514
a|* 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11
515-
* 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
515+
* 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
516516

517517
|`openshift-dedicated`
518518
|OpenShift Dedicated
519-
a|* No value set for the latest `dedicated/` build from the `enterprise-4.14` branch
519+
a|* No value set for the latest `dedicated/` build from the `enterprise-4.15` branch
520520
* 3 for the `dedicated/3` build from the `enterprise-3.11` branch
521521

522522
|`openshift-rosa`
523523
|Red Hat OpenShift Service on AWS
524-
|No value set for the `rosa/` build from the `enterprise-4.14` branch
524+
|No value set for the `rosa/` build from the `enterprise-4.15` branch
525525

526526
|`openshift-online`
527527
|OpenShift Online

‎index-commercial.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ <h2>OpenShift Container Platform</h2>
173173
<div class="btn-group">
174174
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
175175
<ul class="dropdown-menu" role="menu">
176+
<li><a href="container-platform/4.15/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.15</a></li>
176177
<li><a href="container-platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.14</a></li>
177178
<li><a href="container-platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.13</a></li>
178179
<li><a href="container-platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.12</a></li>
@@ -285,7 +286,7 @@ <h2>OpenShift Online</h2>
285286
<h2>OpenShift Kubernetes Engine</h2>
286287
<div class="list-group">
287288
<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>
288-
Read more about <a href="/container-platform/4.14/welcome/oke_about.html">OKE</a>.
289+
Read more about <a href="/container-platform/4.15/welcome/oke_about.html">OKE</a>.
289290
</div>
290291

291292
</div>
@@ -300,6 +301,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
300301
<div class="btn-group">
301302
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
302303
<ul class="dropdown-menu" role="menu">
304+
<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>
303305
<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>
304306
<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>
305307
<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>
@@ -322,6 +324,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
322324
<div class="btn-group">
323325
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
324326
<ul class="dropdown-menu" role="menu">
327+
<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>
325328
<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>
326329
<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>
327330
<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>
@@ -344,6 +347,7 @@ <h2>OpenShift Container Platform <font size="-1">(한국어 문서)</font></h2>
344347
<div class="btn-group">
345348
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">버전 선택<span class="caret"></span></button>
346349
<ul class="dropdown-menu" role="menu">
350+
<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>
347351
<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>
348352
<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>
349353
<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>

‎index-community.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h1 class="cover-heading">Documentation</h1>
5050
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
5151
<ul class="dropdown-menu" role="menu">
5252
<li><a href="latest/"><i class="fa fa-arrow-circle-o-right"></i> OKD Latest</a></li>
53+
<li><a href="4.15/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.15</a></li>
5354
<li><a href="4.14/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.14</a></li>
5455
<li><a href="4.13/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.13</a></li>
5556
<li><a href="4.12/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.12</a></li>

0 commit comments

Comments
 (0)