From 29c443481b3de8df257b5cafe47682b9f48f8d29 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Thu, 4 Apr 2024 09:52:10 +0200
Subject: [PATCH] Add upcoming monthly releases to schedule.yaml

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 content/en/releases/patch-releases.md     |  6 +-----
 data/i18n/en/en.toml                      | 13 +++++++------
 data/releases/schedule.yaml               | 10 ++++++++++
 layouts/shortcodes/upcoming-releases.html | 21 +++++++++++++++++++++
 4 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 layouts/shortcodes/upcoming-releases.html

diff --git a/content/en/releases/patch-releases.md b/content/en/releases/patch-releases.md
index 8f39a86dd2ce1..82cdaeba49621 100644
--- a/content/en/releases/patch-releases.md
+++ b/content/en/releases/patch-releases.md
@@ -76,11 +76,7 @@ Timelines may vary with the severity of bug fixes, but for easier planning we
 will target the following monthly release points. Unplanned, critical
 releases may also occur in between these.
 
-| Monthly Patch Release | Cherry Pick Deadline | Target date |
-| --------------------- | -------------------- | ----------- |
-| April 2024            | 2024-04-12           | 2024-04-17  |
-| May 2024              | 2024-05-10           | 2024-05-15  |
-| June 2024             | 2024-06-07           | 2024-06-11  |
+{{< upcoming-releases >}}
 
 ## Detailed Release History for Active Branches
 
diff --git a/data/i18n/en/en.toml b/data/i18n/en/en.toml
index 717e6542b5e31..45ea68e38b23c 100644
--- a/data/i18n/en/en.toml
+++ b/data/i18n/en/en.toml
@@ -405,6 +405,9 @@ other = "This article is more than one year old. Older articles may contain outd
 [patch_release]
 other = "Patch Release"
 
+[monthly_patch_release]
+other = "Monthly Patch Release"
+
 [post_create_issue]
 other = "Create an issue"
 
@@ -471,14 +474,14 @@ other = "Download Kubernetes component binaries"
 # Please do not localize or modify <current-version> placeholder.
 [release_binary_section]
 other = """You can find the links to download <current-version> Kubernetes components (along with their checksums) below.
-To access downloads for older supported versions, visit the respective documentation 
-link for [older versions](https://kubernetes.io/docs/home/supported-doc-versions/#versions-older) or use [downloadkubernetes.com](https://www.downloadkubernetes.com/).""" 
+To access downloads for older supported versions, visit the respective documentation
+link for [older versions](https://kubernetes.io/docs/home/supported-doc-versions/#versions-older) or use [downloadkubernetes.com](https://www.downloadkubernetes.com/)."""
 
 # NOTE: <current-version> and <current-changelog-url> are placeholders set by 'release-binaries' shortcode.
 # Please do not localize or modify <current-version> and <current-changelog-url>  placeholders.
 [release_binary_section_note]
-other = """To download older patch versions of <current-version> Kubernetes components (and their checksums), 
-please refer to the [CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG/CHANGELOG-<current-changelog-url>.md) file.""" 
+other = """To download older patch versions of <current-version> Kubernetes components (and their checksums),
+please refer to the [CHANGELOG](https://github.com/kubernetes/kubernetes/tree/master/CHANGELOG/CHANGELOG-<current-changelog-url>.md) file."""
 
 [release_binary_version]
 other  = "Version"
@@ -583,5 +586,3 @@ other = "Warning:"
 
 [whatsnext_heading]
 other = "What's next"
-
-
diff --git a/data/releases/schedule.yaml b/data/releases/schedule.yaml
index 3893870f17e2f..efa2fe8547bc8 100644
--- a/data/releases/schedule.yaml
+++ b/data/releases/schedule.yaml
@@ -102,3 +102,13 @@ schedules:
     targetDate: "2023-04-11"
   release: "1.27"
   releaseDate: "2023-04-11"
+upcoming_releases:
+- cherryPickDeadline: "2024-04-12"
+  release: April 2024
+  targetDate: "2024-04-17"
+- cherryPickDeadline: "2024-05-10"
+  release: May 2024
+  targetDate: "2024-05-14"
+- cherryPickDeadline: "2024-06-07"
+  release: June 2024
+  targetDate: "2024-06-11"
diff --git a/layouts/shortcodes/upcoming-releases.html b/layouts/shortcodes/upcoming-releases.html
new file mode 100644
index 0000000000000..c245ad81052ce
--- /dev/null
+++ b/layouts/shortcodes/upcoming-releases.html
@@ -0,0 +1,21 @@
+<div>
+  <table>
+    <thead>
+      <tr>
+        <th>{{ T "monthly_patch_release" }}</th>
+        <th>{{ T "release_cherry_pick_deadline" }}</th>
+        <th>{{ T "release_target_date" }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      {{ range $patchReleaseInfo :=
+      .Site.Data.releases.schedule.upcoming_releases }}
+      <tr>
+        <td>{{ $patchReleaseInfo.release }}</td>
+        <td>{{ $patchReleaseInfo.cherryPickDeadline }}</td>
+        <td>{{ $patchReleaseInfo.targetDate }}</td>
+      </tr>
+      {{ end }}
+    </tbody>
+  </table>
+</div>