Skip to content

Commit

Permalink
release: move markdown tables to shortcode
Browse files Browse the repository at this point in the history
also, add i18n definitions for terms in the patch release page

Signed-off-by: Nabarun Pal <pal.nabarun95@gmail.com>
  • Loading branch information
palnabarun committed Sep 15, 2022
1 parent 85f71d3 commit 6d7a573
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 98 deletions.
5 changes: 5 additions & 0 deletions assets/scss/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,11 @@ dl {
}
}

.release-highlighted-date {
font-weight: bold;
}


.no-js .mermaid {
display: none;
}
Expand Down
101 changes: 3 additions & 98 deletions content/en/releases/patch-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,108 +85,13 @@ releases may also occur in between these.

## Detailed Release History for Active Branches

### 1.25
{{< release-branches >}}

Next patch release is **1.25.1**

**1.25** enters maintenance mode on **2023-08-28**

End of Life for **1.25** is **2023-10-27**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
|---------------|----------------------|-------------|------|
| 1.25.1 | 2022-09-09 | 2022-09-14 | |

### 1.24

Next patch release is **1.24.5**

**1.24** enters maintenance mode on **2023-05-28**.

End of Life for **1.24** is **2023-07-28**

| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE | NOTE |
|---------------|----------------------|-------------|------|
| 1.24.5 | 2022-09-09 | 2022-09-14 | |
| 1.24.4 | 2022-08-12 | 2022-08-17 | |
| 1.24.3 | 2022-07-08 | 2022-07-13 | |
| 1.24.2 | 2022-06-10 | 2022-06-15 | |
| 1.24.1 | 2022-05-20 | 2022-05-24 | |

### 1.23

Next patch release is **1.23.11**

**1.23** enters maintenance mode on **2022-12-28**.

End of Life for **1.23** is **2023-02-28**.

| Patch Release | Cherry Pick Deadline | Target Date | Note |
|---------------|----------------------|-------------|------|
| 1.23.11 | 2022-09-09 | 2022-09-14 | |
| 1.23.10 | 2022-08-12 | 2022-08-17 | |
| 1.23.9 | 2022-07-08 | 2022-07-13 | |
| 1.23.8 | 2022-06-10 | 2022-06-15 | |
| 1.23.7 | 2022-05-20 | 2022-05-24 | |
| 1.23.6 | 2022-04-08 | 2022-04-13 | |
| 1.23.5 | 2022-03-11 | 2022-03-16 | |
| 1.23.4 | 2022-02-11 | 2022-02-16 | |
| 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) |
| 1.23.2 | 2022-01-14 | 2022-01-19 | |
| 1.23.1 | 2021-12-14 | 2021-12-16 | |

### 1.22

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.**

**1.22** enters maintenance mode on **2022-08-28**

End of Life for **1.22** is **2022-10-28**

| Patch Release | Cherry Pick Deadline | Target Date | Note |
|---------------|----------------------|-------------|------|
| 1.22.14 | 2022-09-09 | 2022-09-14 | |
| 1.22.13 | 2022-08-12 | 2022-08-17 | |
| 1.22.12 | 2022-07-08 | 2022-07-13 | |
| 1.22.11 | 2022-06-10 | 2022-06-15 | |
| 1.22.10 | 2022-05-20 | 2022-05-24 | |
| 1.22.9 | 2022-04-08 | 2022-04-13 | |
| 1.22.8 | 2022-03-11 | 2022-03-16 | |
| 1.22.7 | 2022-02-11 | 2022-02-16 | |
| 1.22.6 | 2022-01-14 | 2022-01-19 | |
| 1.22.5 | 2021-12-10 | 2021-12-15 | |
| 1.22.4 | 2021-11-12 | 2021-11-17 | |
| 1.22.3 | 2021-10-22 | 2021-10-27 | |
| 1.22.2 | 2021-09-10 | 2021-09-15 | |
| 1.22.1 | 2021-08-16 | 2021-08-19 | |

## Non-Active Branch History
## Non-Active Branch history

These releases are no longer supported.

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

[cherry-picks]: https://github.com/kubernetes/community/blob/master/contributors/devel/sig-release/cherry-picks.md
[release-managers]: /releases/release-managers
Expand Down
35 changes: 35 additions & 0 deletions data/i18n/en/en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,9 @@ other = "Was this page helpful?"
[feedback_yes]
other = "Yes"

[final_patch_release]
other = "Final Patch Release"

[inline_list_separator]
other = ","

Expand Down Expand Up @@ -250,6 +253,9 @@ other = "Options"
[outdated_blog__message]
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."

[patch_release]
other = "Patch Release"

[post_create_issue]
other = "Create an issue"

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

[release_cherry_pick_deadline]
other = "Cherry Pick Deadline"

# Deprecated. Planned for removal in a future release.
# Use [release_full_details_initial_text] instead.
[release_complete]
other = "Complete"

[release_end_of_life_date]
other = "End Of Life Date"

# Replace [release_complete] with [release_full_details_initial_text]
[release_full_details_initial_text]
other = "Complete"

[release_minor_version]
other = "Minor Version"

[release_info_next_patch]
other = "Next patch release is **%s**."

# Localization note: You can use Markdown here.
# The three placeholders (in order) are:
# Kubernetes minor version
# maintenance mode date
# end of life date
#
# Keep this order. It is OK to use more than one sentence, and it's also OK to change the
# tense of the text so long as the meaning is clear.
[release_info_eol]
other = "**%s** enters maintenance mode on **%s** and End of Life is on **%s**."

[release_note]
other = "Note"

[release_schedule]
other = "Schedule"

[release_target_date]
other = "Target Date"

[release_changelog]
other = "Changelog"

Expand Down
30 changes: 30 additions & 0 deletions layouts/shortcodes/eol-releases.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<div>
<table class="release-eol-versions table table-striped col-md-8">
<thead class="thead">
<tr>
<th class="col-md-2">{{ T "release_minor_version" }}</th>
<th class="col-md-2">{{ T "final_patch_release" }}</th>
<th class="col-md-2">{{ T "release_end_of_life_date" }}</th>
<th class="col-md-4">{{ T "release_note" }}</th>
</tr>
</thead>
<tbody>
{{ range $eolRelease := .Site.Data.releases.eol.branches }}
<tr>
<td>
{{ $eolRelease.release }}
</td>
<td>
{{ $eolRelease.finalPatchRelease }}
</td>
<td>
{{ $eolRelease.endOfLifeDate }}
</td>
<td lang="en-US">
{{ $eolRelease.note | markdownify }}
</td>
</tr>
{{ end }}
</tbody>
</table>
</div>
57 changes: 57 additions & 0 deletions layouts/shortcodes/release-branches.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{{ range $releaseInfo := .Site.Data.releases.schedule.schedules }}
{{- $version := printf "%.2f" $releaseInfo.release -}}
{{- $dataIdVersion := replace ( printf "%.2f" $releaseInfo.release ) "." "-" | anchorize -}}

<h3 id="{{ $dataIdVersion }}">{{ $version }}</h3>
<p>
{{ printf (T "release_info_next_patch") $releaseInfo.next.release | markdownify }}
</p>
<p>
{{ $releaseInfo.next.note | markdownify }}
</p>
<p>
{{ printf (T "release_info_eol")
$version
( printf "<time datetime=%s>%s</time>"
(time.Format "2006-01-02" $releaseInfo.maintenanceModeStartDate)
(time.Format ( T "release_date_format") $releaseInfo.maintenanceModeStartDate)
)
( printf "<time datetime=%s>%s</time>"
(time.Format "2006-01-02" $releaseInfo.endOfLifeDate)
(time.Format ( T "release_date_format") $releaseInfo.endOfLifeDate)
)
| safeHTML | markdownify }}
</p>
{{ if $releaseInfo.previousPatches }}
<div>
<table class="release-maintained-version table table-striped col-md-8">
<thead class="thead">
<tr>
<th class="col-md-2">{{ T "patch_release" }}</th>
<th class="col-md-2">{{ T "release_cherry_pick_deadline" }}</th>
<th class="col-md-2">{{ T "release_target_date" }}</th>
<th class="col-md-4">{{ T "release_note" }}</th>
</tr>
</thead>
<tbody>
{{ range $patchReleaseInfo := $releaseInfo.previousPatches }}
<tr>
<td>
{{ $patchReleaseInfo.release }}
</td>
<td>
{{ $patchReleaseInfo.cherryPickDeadline }}
</td>
<td>
{{ $patchReleaseInfo.targetDate }}
</td>
<td lang="en-US">
{{ $patchReleaseInfo.note | markdownify }}
</td>
</tr>
{{ end }}
</tbody>
</table>
</div>
{{ end }}
{{ end }}

0 comments on commit 6d7a573

Please sign in to comment.