Skip to content

Commit f3302de

Browse files
committed
4.14 GA
1 parent cf46003 commit f3302de

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
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\.13/$2 [NE,R=301]
156+
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.14/$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
@@ -576,7 +576,7 @@ AddType text/vtt vtt
576576
RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
577577
RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
578578
RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
579-
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]
579+
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]
580580
RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
581581

582582

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
- |
2222
./scripts/get-updated-distros.sh |
2323
while read -r filename; do
24-
if [ "$filename" == "_topic_maps/_topic_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.14 --no-upstream-fetch || travis_terminate 1
24+
if [ "$filename" == "_topic_maps/_topic_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.15 --no-upstream-fetch || travis_terminate 1
2525
2626
elif [ "$filename" == "_topic_maps/_topic_map_osd.yml" ]; then python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch || travis_terminate 1
2727
2828
elif [ "$filename" == "_topic_maps/_topic_map_ms.yml" ]; then python3 build.py --distro microshift --product "Microshift" --version 4 --no-upstream-fetch || travis_terminate 1
2929
3030
elif [ "$filename" == "_topic_maps/_topic_map_rosa.yml" ]; then python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch || travis_terminate 1
3131
32-
elif [ "$filename" == "_distro_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.14 --no-upstream-fetch || travis_terminate 1
32+
elif [ "$filename" == "_distro_map.yml" ]; then python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.15 --no-upstream-fetch || travis_terminate 1
3333
fi
3434
done
3535
- if [ -d "drupal-build" ]; then python3 makeBuild.py || travis_terminate 1; fi

_distro_map.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ openshift-origin:
3333
enterprise-4.13:
3434
name: '4.13'
3535
dir: '4.13'
36+
enterprise-4.14:
37+
name: '4.14'
38+
dir: '4.14'
3639
enterprise-3.6:
3740
name: '3.6'
3841
dir: '3.6'
@@ -146,6 +149,9 @@ openshift-enterprise:
146149
enterprise-4.14:
147150
name: '4.14'
148151
dir: container-platform/4.14
152+
enterprise-4.15:
153+
name: '4.15'
154+
dir: container-platform/4.15
149155
openshift-dedicated:
150156
name: OpenShift Dedicated
151157
author: OpenShift Documentation Project <[email protected]>
@@ -156,7 +162,7 @@ openshift-dedicated:
156162
enterprise-3.11:
157163
name: '3'
158164
dir: dedicated/3
159-
enterprise-4.13:
165+
enterprise-4.14:
160166
name: ''
161167
dir: dedicated/
162168
openshift-aro:
@@ -179,7 +185,7 @@ openshift-rosa:
179185
site_name: Documentation
180186
site_url: https://docs.openshift.com/
181187
branches:
182-
enterprise-4.13:
188+
enterprise-4.14:
183189
name: ''
184190
dir: rosa/
185191
rosa-preview:
@@ -192,7 +198,7 @@ openshift-rosa-portal:
192198
site_name: Documentation
193199
site_url: https://docs.openshift.com/
194200
branches:
195-
enterprise-4.13:
201+
enterprise-4.14:
196202
name: ''
197203
dir: rosa-portal/
198204
openshift-webscale:

_templates/_page_openshift.html.erb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</span>
6767
<% end %>
6868

69-
<% if (version == "4.14") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
69+
<% if (version == "4.15") && (distro_key != "openshift-webscale" && distro_key != "openshift-dpu") %>
7070
<span>
7171
<div class="alert alert-danger" role="alert" id="support-alert">
7272
<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>.
@@ -152,6 +152,7 @@
152152
</a>
153153
<% end %>
154154
<select id="version-selector" onchange="versionSelector(this);">
155+
<option value="4.14">4.14</option>
155156
<option value="4.13">4.13</option>
156157
<option value="4.12">4.12</option>
157158
<option value="4.11">4.11</option>
@@ -236,6 +237,7 @@
236237
</a>
237238
<select id="version-selector" onchange="versionSelector(this);">
238239
<option value="latest">latest</option>
240+
<option value="4.14">4.14</option>
239241
<option value="4.13">4.13</option>
240242
<option value="4.12">4.12</option>
241243
<option value="4.11">4.11</option>

contributing_to_docs/doc_guidelines.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,22 +489,22 @@ possible values for `{product-title}` and `{product-version}`, depending on the
489489
|`openshift-origin`
490490
|OKD
491491
a|* 3.6, 3.7, 3.9, 3.10, 3.11
492-
* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13
492+
* 4.8, 4.9, 4.10, 4.11, 4.12, 4.13, 4.14
493493
* 4 for the `latest/` build from the `main` branch
494494

495495
|`openshift-enterprise`
496496
|OpenShift Container Platform
497497
a|* 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11
498-
* 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
498+
* 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
499499

500500
|`openshift-dedicated`
501501
|OpenShift Dedicated
502-
a|* No value set for the latest `dedicated/` build from the `enterprise-4.13` branch
502+
a|* No value set for the latest `dedicated/` build from the `enterprise-4.14` branch
503503
* 3 for the `dedicated/3` build from the `enterprise-3.11` branch
504504

505505
|`openshift-rosa`
506506
|Red Hat OpenShift Service on AWS
507-
|No value set for the `rosa/` build from the `enterprise-4.13` branch
507+
|No value set for the `rosa/` build from the `enterprise-4.14` branch
508508

509509
|`openshift-online`
510510
|OpenShift Online

index-commercial.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ <h2>OpenShift Container Platform</h2>
178178
<div class="btn-group">
179179
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Select Version<span class="caret"></span></button>
180180
<ul class="dropdown-menu" role="menu">
181+
<li><a href="container-platform/4.14/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.14</a></li>
181182
<li><a href="container-platform/4.13/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.13</a></li>
182183
<li><a href="container-platform/4.12/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.12</a></li>
183184
<li><a href="container-platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.11</a></li>
@@ -288,7 +289,7 @@ <h2>OpenShift Online</h2>
288289
<h2>OpenShift Kubernetes Engine</h2>
289290
<div class="list-group">
290291
<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>
291-
Read more about <a href="/container-platform/4.13/welcome/oke_about.html">OKE</a>.
292+
Read more about <a href="/container-platform/4.14/welcome/oke_about.html">OKE</a>.
292293
</div>
293294

294295
</div>
@@ -303,6 +304,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
303304
<div class="btn-group">
304305
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
305306
<ul class="dropdown-menu" role="menu">
307+
<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>
306308
<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>
307309
<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>
308310
<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>
@@ -324,6 +326,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
324326
<div class="btn-group">
325327
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
326328
<ul class="dropdown-menu" role="menu">
329+
<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>
327330
<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>
328331
<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>
329332
<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>
@@ -345,6 +348,7 @@ <h2>OpenShift Container Platform <font size="-1">(한국어 문서)</font></h2>
345348
<div class="btn-group">
346349
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">버전 선택<span class="caret"></span></button>
347350
<ul class="dropdown-menu" role="menu">
351+
<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>
350354
<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>

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.14/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.14</a></li>
5354
<li><a href="4.13/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.13</a></li>
5455
<li><a href="4.12/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.12</a></li>
5556
<li><a href="4.11/"><i class="fa fa-arrow-circle-o-right"></i> OKD 4.11</a></li>

0 commit comments

Comments
 (0)