Skip to content

Commit 6d45af7

Browse files
authored
Merge pull request #36609 from palnabarun/patch-releases/august-update
Generate Patch Release table using Hugo Shortcode
2 parents 1e70b5c + 6d7a573 commit 6d45af7

File tree

7 files changed

+216
-111
lines changed

7 files changed

+216
-111
lines changed

assets/scss/_custom.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,11 @@ dl {
844844
}
845845
}
846846

847+
.release-highlighted-date {
848+
font-weight: bold;
849+
}
850+
851+
847852
.no-js .mermaid {
848853
display: none;
849854
}

content/en/releases/patch-releases.md

Lines changed: 3 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -85,108 +85,13 @@ releases may also occur in between these.
8585

8686
## Detailed Release History for Active Branches
8787

88-
### 1.25
88+
{{< release-branches >}}
8989

90-
Next patch release is **1.25.1**
91-
92-
**1.25** enters maintenance mode on **2023-08-28**
93-
94-
End of Life for **1.25** is **2023-10-27**
95-
96-
| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
97-
|---------------|----------------------|-------------|------|
98-
| 1.25.1 | 2022-09-09 | 2022-09-14 | |
99-
100-
### 1.24
101-
102-
Next patch release is **1.24.5**
103-
104-
**1.24** enters maintenance mode on **2023-05-28**.
105-
106-
End of Life for **1.24** is **2023-07-28**
107-
108-
| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
109-
|---------------|----------------------|-------------|------|
110-
| 1.24.5 | 2022-09-09 | 2022-09-14 | |
111-
| 1.24.4 | 2022-08-12 | 2022-08-17 | |
112-
| 1.24.3 | 2022-07-08 | 2022-07-13 | |
113-
| 1.24.2 | 2022-06-10 | 2022-06-15 | |
114-
| 1.24.1 | 2022-05-20 | 2022-05-24 | |
115-
116-
### 1.23
117-
118-
Next patch release is **1.23.11**
119-
120-
**1.23** enters maintenance mode on **2022-12-28**.
121-
122-
End of Life for **1.23** is **2023-02-28**.
123-
124-
| Patch Release | Cherry Pick Deadline | Target Date | Note |
125-
|---------------|----------------------|-------------|------|
126-
| 1.23.11 | 2022-09-09 | 2022-09-14 | |
127-
| 1.23.10 | 2022-08-12 | 2022-08-17 | |
128-
| 1.23.9 | 2022-07-08 | 2022-07-13 | |
129-
| 1.23.8 | 2022-06-10 | 2022-06-15 | |
130-
| 1.23.7 | 2022-05-20 | 2022-05-24 | |
131-
| 1.23.6 | 2022-04-08 | 2022-04-13 | |
132-
| 1.23.5 | 2022-03-11 | 2022-03-16 | |
133-
| 1.23.4 | 2022-02-11 | 2022-02-16 | |
134-
| 1.23.3 | 2022-01-24 | 2022-01-25 | [Out-of-Band Release](https://groups.google.com/a/kubernetes.io/g/dev/c/Xl1sm-CItaY) |
135-
| 1.23.2 | 2022-01-14 | 2022-01-19 | |
136-
| 1.23.1 | 2021-12-14 | 2021-12-16 | |
137-
138-
### 1.22
139-
140-
Next patch release is **1.22.14**. **Since 1.22 is in maintenance mode, this patch release may not be shipped. For more information, see the Support Period policy above.**
141-
142-
**1.22** enters maintenance mode on **2022-08-28**
143-
144-
End of Life for **1.22** is **2022-10-28**
145-
146-
| Patch Release | Cherry Pick Deadline | Target Date | Note |
147-
|---------------|----------------------|-------------|------|
148-
| 1.22.14 | 2022-09-09 | 2022-09-14 | |
149-
| 1.22.13 | 2022-08-12 | 2022-08-17 | |
150-
| 1.22.12 | 2022-07-08 | 2022-07-13 | |
151-
| 1.22.11 | 2022-06-10 | 2022-06-15 | |
152-
| 1.22.10 | 2022-05-20 | 2022-05-24 | |
153-
| 1.22.9 | 2022-04-08 | 2022-04-13 | |
154-
| 1.22.8 | 2022-03-11 | 2022-03-16 | |
155-
| 1.22.7 | 2022-02-11 | 2022-02-16 | |
156-
| 1.22.6 | 2022-01-14 | 2022-01-19 | |
157-
| 1.22.5 | 2021-12-10 | 2021-12-15 | |
158-
| 1.22.4 | 2021-11-12 | 2021-11-17 | |
159-
| 1.22.3 | 2021-10-22 | 2021-10-27 | |
160-
| 1.22.2 | 2021-09-10 | 2021-09-15 | |
161-
| 1.22.1 | 2021-08-16 | 2021-08-19 | |
162-
163-
## Non-Active Branch History
90+
## Non-Active Branch history
16491

16592
These releases are no longer supported.
16693

167-
| Minor Version | Final Patch Release | EOL Date | Note |
168-
| ------------- | ------------------- | ---------- | ---------------------------------------------------------------------- |
169-
| 1.21 | 1.21.14 | 2022-06-28 | |
170-
| 1.20 | 1.20.15 | 2022-02-28 | |
171-
| 1.19 | 1.19.16 | 2021-10-28 | |
172-
| 1.18 | 1.18.20 | 2021-06-18 | Created to resolve regression introduced in 1.18.19 |
173-
| 1.18 | 1.18.19 | 2021-05-12 | [Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs) |
174-
| 1.17 | 1.17.17 | 2021-01-13 | |
175-
| 1.16 | 1.16.15 | 2020-09-02 | |
176-
| 1.15 | 1.15.12 | 2020-05-06 | |
177-
| 1.14 | 1.14.10 | 2019-12-11 | |
178-
| 1.13 | 1.13.12 | 2019-10-15 | |
179-
| 1.12 | 1.12.10 | 2019-07-08 | |
180-
| 1.11 | 1.11.10 | 2019-05-01 | |
181-
| 1.10 | 1.10.13 | 2019-02-13 | |
182-
| 1.9 | 1.9.11 | 2018-09-29 | |
183-
| 1.8 | 1.8.15 | 2018-07-12 | |
184-
| 1.7 | 1.7.16 | 2018-04-04 | |
185-
| 1.6 | 1.6.13 | 2017-11-23 | |
186-
| 1.5 | 1.5.8 | 2017-10-01 | |
187-
| 1.4 | 1.4.12 | 2017-04-21 | |
188-
| 1.3 | 1.3.10 | 2016-11-01 | |
189-
| 1.2 | 1.2.7 | 2016-10-23 | |
94+
{{< eol-releases >}}
19095

19196
[cherry-picks]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md
19297
[release-managers]: /releases/release-managers

data/i18n/en/en.toml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ other = "Was this page helpful?"
123123
[feedback_yes]
124124
other = "Yes"
125125

126+
[final_patch_release]
127+
other = "Final Patch Release"
128+
126129
[inline_list_separator]
127130
other = ","
128131

@@ -250,6 +253,9 @@ other = "Options"
250253
[outdated_blog__message]
251254
other = "This article is more than one year old. Older articles may contain outdated content. Check that the information in the page has not become incorrect since its publication."
252255

256+
[patch_release]
257+
other = "Patch Release"
258+
253259
[post_create_issue]
254260
other = "Create an issue"
255261

@@ -270,18 +276,47 @@ other = "(released: "
270276
[release_date_format]
271277
other = "2006-01-02"
272278

279+
[release_cherry_pick_deadline]
280+
other = "Cherry Pick Deadline"
281+
273282
# Deprecated. Planned for removal in a future release.
274283
# Use [release_full_details_initial_text] instead.
275284
[release_complete]
276285
other = "Complete"
277286

287+
[release_end_of_life_date]
288+
other = "End Of Life Date"
289+
278290
# Replace [release_complete] with [release_full_details_initial_text]
279291
[release_full_details_initial_text]
280292
other = "Complete"
281293

294+
[release_minor_version]
295+
other = "Minor Version"
296+
297+
[release_info_next_patch]
298+
other = "Next patch release is **%s**."
299+
300+
# Localization note: You can use Markdown here.
301+
# The three placeholders (in order) are:
302+
# Kubernetes minor version
303+
# maintenance mode date
304+
# end of life date
305+
#
306+
# Keep this order. It is OK to use more than one sentence, and it's also OK to change the
307+
# tense of the text so long as the meaning is clear.
308+
[release_info_eol]
309+
other = "**%s** enters maintenance mode on **%s** and End of Life is on **%s**."
310+
311+
[release_note]
312+
other = "Note"
313+
282314
[release_schedule]
283315
other = "Schedule"
284316

317+
[release_target_date]
318+
other = "Target Date"
319+
285320
[release_changelog]
286321
other = "Changelog"
287322

data/releases/eol.yaml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
branches:
2+
- release: "1.21"
3+
finalPatchRelease: "1.21.14"
4+
endOfLifeDate: 2022-06-28
5+
- release: "1.20"
6+
finalPatchRelease: "1.20.15"
7+
endOfLifeDate: 2022-02-28
8+
- release: "1.19"
9+
finalPatchRelease: "1.19.16"
10+
endOfLifeDate: 2021-10-28
11+
- release: "1.18"
12+
finalPatchRelease: "1.18.20"
13+
endOfLifeDate: 2021-06-18
14+
note: >-
15+
Created to solve regression introduced in 1.18.19
16+
- release: "1.18"
17+
finalPatchRelease: "1.18.19"
18+
endOfLifeDate: 2021-05-12
19+
note: >-
20+
[Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs)
21+
- release: "1.17"
22+
finalPatchRelease: "1.17.17"
23+
endOfLifeDate: 2021-01-13
24+
- release: "1.16"
25+
finalPatchRelease: "1.16.15"
26+
endOfLifeDate: 2020-09-02
27+
- release: "1.15"
28+
finalPatchRelease: "1.15.12"
29+
endOfLifeDate: 2020-05-06
30+
- release: "1.14"
31+
finalPatchRelease: "1.14.10"
32+
endOfLifeDate: 2019-12-11
33+
- release: "1.13"
34+
finalPatchRelease: "1.13.12"
35+
endOfLifeDate: 2019-10-15
36+
- release: "1.12"
37+
finalPatchRelease: "1.12.10"
38+
endOfLifeDate: 2019-07-08
39+
- release: "1.11"
40+
finalPatchRelease: "1.11.10"
41+
endOfLifeDate: 2019-05-01
42+
- release: "1.10"
43+
finalPatchRelease: "1.10.13"
44+
endOfLifeDate: 2019-02-13
45+
- release: "1.9"
46+
finalPatchRelease: "1.9.11"
47+
endOfLifeDate: 2018-09-29
48+
- release: "1.8"
49+
finalPatchRelease: "1.8.15"
50+
endOfLifeDate: 2018-07-12
51+
- release: "1.7"
52+
finalPatchRelease: "1.7.16"
53+
endOfLifeDate: 2018-04-04
54+
- release: "1.6"
55+
finalPatchRelease: "1.6.13"
56+
endOfLifeDate: 2017-11-23
57+
- release: "1.5"
58+
finalPatchRelease: "1.5.8"
59+
endOfLifeDate: 2017-10-01
60+
- release: "1.4"
61+
finalPatchRelease: "1.4.12"
62+
endOfLifeDate: 2017-04-21
63+
- release: "1.3"
64+
finalPatchRelease: "1.3.10"
65+
endOfLifeDate: 2016-11-01
66+
- release: "1.2"
67+
finalPatchRelease: "1.2.7"
68+
endOfLifeDate: 2016-10-23

data/releases/schedule.yaml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ schedules:
33
releaseDate: 2022-08-23
44
maintenanceModeStartDate: 2023-08-28
55
endOfLifeDate: 2023-10-27
6-
next: 1.25.1
7-
cherryPickDeadline: 2022-09-09
8-
targetDate: 2022-09-14
6+
next:
7+
release: 1.25.1
8+
cherryPickDeadline: 2022-09-09
9+
targetDate: 2022-09-14
910
- release: 1.24
1011
releaseDate: 2022-05-03
1112
maintenanceModeStartDate: 2023-05-28
1213
endOfLifeDate: 2023-07-28
13-
next: 1.24.5
14-
cherryPickDeadline: 2022-09-09
15-
targetDate: 2022-09-14
14+
next:
15+
release: 1.24.5
16+
cherryPickDeadline: 2022-09-09
17+
targetDate: 2022-09-14
1618
previousPatches:
1719
- release: 1.24.4
1820
cherryPickDeadline: 2022-08-12
@@ -30,9 +32,10 @@ schedules:
3032
releaseDate: 2021-12-07
3133
maintenanceModeStartDate: 2022-12-28
3234
endOfLifeDate: 2023-02-28
33-
next: 1.23.11
34-
cherryPickDeadline: 2022-09-09
35-
targetDate: 2022-09-14
35+
next:
36+
release: 1.23.11
37+
cherryPickDeadline: 2022-09-09
38+
targetDate: 2022-09-14
3639
previousPatches:
3740
- release: 1.23.10
3841
cherryPickDeadline: 2022-08-12
@@ -58,7 +61,8 @@ schedules:
5861
- release: 1.23.3
5962
cherryPickDeadline: 2022-01-24
6063
targetDate: 2022-01-25
61-
note: "Out-of-Bound Release https://groups.google.com/a/kubernetes.io/g/dev/c/Xl1sm-CItaY"
64+
note: >-
65+
[Out-of-Bound Release](https://groups.google.com/a/kubernetes.io/g/dev/c/Xl1sm-CItaY)
6266
- release: 1.23.2
6367
cherryPickDeadline: 2022-01-14
6468
targetDate: 2022-01-19
@@ -69,9 +73,10 @@ schedules:
6973
releaseDate: 2021-08-04
7074
maintenanceModeStartDate: 2022-08-28
7175
endOfLifeDate: 2022-10-28
72-
next: 1.22.14
73-
cherryPickDeadline: 2022-09-09
74-
targetDate: 2022-09-14
76+
next:
77+
release: 1.22.14
78+
cherryPickDeadline: 2022-09-09
79+
targetDate: 2022-09-14
7580
previousPatches:
7681
- release: 1.22.13
7782
cherryPickDeadline: 2022-08-12

layouts/shortcodes/eol-releases.html

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<div>
2+
<table class="release-eol-versions table table-striped col-md-8">
3+
<thead class="thead">
4+
<tr>
5+
<th class="col-md-2">{{ T "release_minor_version" }}</th>
6+
<th class="col-md-2">{{ T "final_patch_release" }}</th>
7+
<th class="col-md-2">{{ T "release_end_of_life_date" }}</th>
8+
<th class="col-md-4">{{ T "release_note" }}</th>
9+
</tr>
10+
</thead>
11+
<tbody>
12+
{{ range $eolRelease := .Site.Data.releases.eol.branches }}
13+
<tr>
14+
<td>
15+
{{ $eolRelease.release }}
16+
</td>
17+
<td>
18+
{{ $eolRelease.finalPatchRelease }}
19+
</td>
20+
<td>
21+
{{ $eolRelease.endOfLifeDate }}
22+
</td>
23+
<td lang="en-US">
24+
{{ $eolRelease.note | markdownify }}
25+
</td>
26+
</tr>
27+
{{ end }}
28+
</tbody>
29+
</table>
30+
</div>

0 commit comments

Comments
 (0)