Skip to content

Commit 71636d2

Browse files
committed
4.12 GA
1 parent 24262de commit 71636d2

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

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

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

155155
# Redirects for "latest" version
156156
RewriteRule ^(container-platform|enterprise)/?$ /container-platform/latest [R=301]
157-
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.11/$2 [NE,R=301]
157+
RewriteRule ^(container-platform|enterprise)/latest/?(.*)$ /container-platform/4\.12/$2 [NE,R=301]
158158
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]
159159

160160
# Release notes redirects
@@ -448,7 +448,7 @@ AddType text/vtt vtt
448448
RewriteRule ^rosa/?$ /rosa/welcome/index.html [L,R=301]
449449
RewriteRule ^enterprise/(3\.0|3\.1|3\.2)/?$ /enterprise/$1/welcome/index.html [L,R=301]
450450
RewriteRule ^enterprise/3\.3/?$ /container-platform/3.3/welcome/index.html [L,R=301]
451-
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]
451+
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]
452452
RewriteRule ^container-platform-ocp/(4\.3|4\.4|4\.8)/?$ /container-platform-ocp/$1/welcome/index.html [L,R=301]
453453

454454

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
- pip3 install pyyaml
1919
- pip3 install aura.tar.gz
2020
script:
21-
- python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.11 --no-upstream-fetch && python3 makeBuild.py
21+
- python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.12 --no-upstream-fetch && python3 makeBuild.py
2222
- # stage name not required, will continue to use `build`
23-
if: branch IN (main, enterprise-4.11, enterprise-4.12)
23+
if: branch IN (main, enterprise-4.12, enterprise-4.13)
2424
name: "Build openshift-dedicated distro"
2525
before_install:
2626
- gem install asciidoctor
@@ -31,7 +31,7 @@ jobs:
3131
script:
3232
- python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch && python3 makeBuild.py
3333
- # stage name not required, will continue to use `build`
34-
if: branch IN (main, enterprise-4.11, enterprise-4.12)
34+
if: branch IN (main, enterprise-4.12, enterprise-4.13)
3535
name: "Build openshift-rosa distro"
3636
before_install:
3737
- gem install asciidoctor
@@ -75,7 +75,7 @@ jobs:
7575
env:
7676
- CAN_FAIL=true
7777
language: minimal
78-
if: branch IN (main, enterprise-4.11, enterprise-4.12)
78+
if: branch IN (main, enterprise-4.12, enterprise-4.13)
7979
script:
8080
- chmod +x autopreview.sh && ./autopreview.sh
8181

_distro_map.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ openshift-origin:
2727
enterprise-4.11:
2828
name: '4.11'
2929
dir: '4.11'
30+
enterprise-4.12:
31+
name: '4.12'
32+
dir: '4.12'
3033
enterprise-3.6:
3134
name: '3.6'
3235
dir: '3.6'
@@ -144,7 +147,7 @@ openshift-dedicated:
144147
enterprise-3.11:
145148
name: '3'
146149
dir: dedicated/3
147-
enterprise-4.11:
150+
enterprise-4.12:
148151
name: ''
149152
dir: dedicated/
150153
openshift-aro:
@@ -167,7 +170,7 @@ openshift-rosa:
167170
site_name: Documentation
168171
site_url: https://docs.openshift.com/
169172
branches:
170-
enterprise-4.11:
173+
enterprise-4.12:
171174
name: ''
172175
dir: rosa/
173176
rosa-preview:

_templates/_page_openshift.html.erb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<div class="container">
4747
<button id="hc-open-btn" class="open-btn-sm" onclick="openNav()" aria-label="Open"><span class="fa fa-bars" /></button>
4848
<ol class="breadcrumb hide-for-print">
49-
<% if (version == "4.12" || distro_key == "openshift-webscale" || distro_key == "openshift-dpu") %>
49+
<% if (version == "4.13" || distro_key == "openshift-webscale" || distro_key == "openshift-dpu") %>
5050
<span>
5151
<div class="alert alert-danger" role="alert" id="support-alert">
5252
<strong>This documentation is work in progress and might not be complete or fully tested.</strong> The latest supported version of version 3 is <a href="https://docs.openshift.com/container-platform/3.11/welcome/index.html" class="link-primary" style="color: #545454 !important;">[3.11]</a>. For the most recent version 4, see <a href="https://docs.openshift.com/container-platform/latest/welcome/index.html" style="color: #545454 !important" class="link-primary">[4]</a>.
@@ -100,6 +100,7 @@
100100
</a>
101101
<% end %>
102102
<select id="version-selector" onchange="versionSelector(this);">
103+
<option value="4.12">4.12</option>
103104
<option value="4.11">4.11</option>
104105
<option value="4.10">4.10</option>
105106
<option value="4.9">4.9</option>
@@ -146,6 +147,7 @@
146147
</a>
147148
<select id="version-selector" onchange="versionSelector(this);">
148149
<option value="latest">latest</option>
150+
<option value="4.12">4.12</option>
149151
<option value="4.11">4.11</option>
150152
<option value="4.10">4.10</option>
151153
<option value="4.9">4.9</option>

contributing_to_docs/doc_guidelines.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,22 +475,22 @@ possible values for `{product-title}` and `{product-version}`, depending on the
475475
|`openshift-origin`
476476
|OKD
477477
a|* 3.6, 3.7, 3.9, 3.10, 3.11
478-
* 4.6, 4.7, 4.8, 4.9, 4.10, 4.11
478+
* 4.8, 4.9, 4.10, 4.11, 4.12
479479
* 4 for the `latest/` build from the `main` branch
480480

481481
|`openshift-enterprise`
482482
|OpenShift Container Platform
483483
a|* 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6, 3.7, 3.9, 3.10, 3.11
484-
* 4.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.7, 4.8, 4.9, 4.10, 4.11, 4.12
484+
* 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
485485

486486
|`openshift-dedicated`
487487
|OpenShift Dedicated
488-
a|* No value set for the latest `dedicated/` build from the `enterprise-4.11` branch
488+
a|* No value set for the latest `dedicated/` build from the `enterprise-4.12` branch
489489
* 3 for the `dedicated/3` build from the `enterprise-3.11` branch
490490

491491
|`openshift-rosa`
492492
|Red Hat OpenShift Service on AWS
493-
|No value set for the `rosa/` build from the `enterprise-4.11` branch
493+
|No value set for the `rosa/` build from the `enterprise-4.12` branch
494494

495495
|`openshift-online`
496496
|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.12/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.12</a></li>
181182
<li><a href="container-platform/4.11/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.11</a></li>
182183
<li><a href="container-platform/4.10/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.10</a></li>
183184
<li><a href="container-platform/4.9/"><i class="fa fa-arrow-circle-o-right"></i> Container Platform 4.9</a></li>
@@ -292,7 +293,7 @@ <h2>OpenShift Online</h2>
292293
<h2>OpenShift Kubernetes Engine</h2>
293294
<div class="list-group">
294295
<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>
295-
Read more about <a href="/container-platform/4.11/welcome/oke_about.html">OKE</a>.
296+
Read more about <a href="/container-platform/4.12/welcome/oke_about.html">OKE</a>.
296297
</div>
297298

298299
</div>
@@ -307,6 +308,7 @@ <h2>OpenShift Container Platform <font size="-1">(日本語翻訳)</font></h2>
307308
<div class="btn-group">
308309
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">バージョンを選択する<span class="caret"></span></button>
309310
<ul class="dropdown-menu" role="menu">
311+
<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>
310312
<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>
311313
<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>
312314
<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>
@@ -326,6 +328,7 @@ <h2>OpenShift Container Platform <font size="-1">(中文文档)</font></h2>
326328
<div class="btn-group">
327329
<button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-expanded="false">选择版本<span class="caret"></span></button>
328330
<ul class="dropdown-menu" role="menu">
331+
<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>
330333
<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>
331334
<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>
@@ -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.12/"><i class="fa fa-arrow-circle-o-right"></i> 4.12</a></li>
348352
<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>
349353
<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>
350354
<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>

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

0 commit comments

Comments
 (0)