From a620a8051918208007bc6fc0b58e9fc29ef57884 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Fri, 19 Apr 2024 10:43:45 +0200
Subject: [PATCH] Update schedule using schedule-builder

This is a manual update of the schedule and end-of-life data to match
the format proposed by
[`schedule-builder`](https://github.com/kubernetes/release/tree/master/cmd/schedule-builder).

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 data/releases/eol.yaml                   | 193 +++++++++---------
 data/releases/schedule.yaml              | 236 ++++++++++++-----------
 layouts/shortcodes/release-branches.html |   4 +-
 layouts/shortcodes/release-data.html     |   4 +-
 4 files changed, 221 insertions(+), 216 deletions(-)

diff --git a/data/releases/eol.yaml b/data/releases/eol.yaml
index fb37eac0b4..222d330c70 100644
--- a/data/releases/eol.yaml
+++ b/data/releases/eol.yaml
@@ -1,99 +1,96 @@
 branches:
-  - release: "1.26"
-    finalPatchRelease: "1.26.15"
-    endOfLifeDate: 2024-02-28
-    note: >-
-      1.26.15 was released in March 2024 (after the EOL date) to pick up a new version of Go to [address several Go CVEs](https://groups.google.com/g/golang-dev/c/o1I1Vv8Rfgs/m/Wr8tD1RlAgAJ)
-  - release: "1.25"
-    finalPatchRelease: "1.25.16"
-    endOfLifeDate: 2023-10-28
-    note: >-
-      1.25.16 was released in November 2023 (after the EOL date) to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
-  - release: "1.24"
-    finalPatchRelease: "1.24.17"
-    endOfLifeDate: 2023-07-28
-    note: >-
-      1.24.17 was released in August 2023 (after the EOL date) to fix CVE-2023-3676 and CVE-2023-3955
-  - release: "1.23"
-    finalPatchRelease: "1.23.17"
-    endOfLifeDate: 2023-02-28
-  - release: "1.22"
-    finalPatchRelease: "1.22.17"
-    endOfLifeDate: 2022-12-08
-    note: >-
-      1.22.17 was released in December 2022 (after the EOL date) to backport registry changes and fix two critical issues.
-  - release: "1.22"
-    finalPatchRelease: "1.22.16"
-    endOfLifeDate: 2022-11-09
-    note: >-
-      1.22.16 was released in November 2022 (after the EOL date) to fix CVE-2022-3162 and CVE-2022-3294.
-  - release: "1.22"
-    finalPatchRelease: "1.22.15"
-    endOfLifeDate: 2022-10-28
-  - release: "1.21"
-    finalPatchRelease: "1.21.14"
-    endOfLifeDate: 2022-06-28
-  - release: "1.20"
-    finalPatchRelease: "1.20.15"
-    endOfLifeDate: 2022-02-28
-  - release: "1.19"
-    finalPatchRelease: "1.19.16"
-    endOfLifeDate: 2021-10-28
-  - release: "1.18"
-    finalPatchRelease: "1.18.20"
-    endOfLifeDate: 2021-06-18
-    note: >-
-      Created to solve regression introduced in 1.18.19
-  - release: "1.18"
-    finalPatchRelease: "1.18.19"
-    endOfLifeDate: 2021-05-12
-    note: >-
-      [Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs)
-  - release: "1.17"
-    finalPatchRelease: "1.17.17"
-    endOfLifeDate: 2021-01-13
-  - release: "1.16"
-    finalPatchRelease: "1.16.15"
-    endOfLifeDate: 2020-09-02
-  - release: "1.15"
-    finalPatchRelease: "1.15.12"
-    endOfLifeDate: 2020-05-06
-  - release: "1.14"
-    finalPatchRelease: "1.14.10"
-    endOfLifeDate: 2019-12-11
-  - release: "1.13"
-    finalPatchRelease: "1.13.12"
-    endOfLifeDate: 2019-10-15
-  - release: "1.12"
-    finalPatchRelease: "1.12.10"
-    endOfLifeDate: 2019-07-08
-  - release: "1.11"
-    finalPatchRelease: "1.11.10"
-    endOfLifeDate: 2019-05-01
-  - release: "1.10"
-    finalPatchRelease: "1.10.13"
-    endOfLifeDate: 2019-02-13
-  - release: "1.9"
-    finalPatchRelease: "1.9.11"
-    endOfLifeDate: 2018-09-29
-  - release: "1.8"
-    finalPatchRelease: "1.8.15"
-    endOfLifeDate: 2018-07-12
-  - release: "1.7"
-    finalPatchRelease: "1.7.16"
-    endOfLifeDate: 2018-04-04
-  - release: "1.6"
-    finalPatchRelease: "1.6.13"
-    endOfLifeDate: 2017-11-23
-  - release: "1.5"
-    finalPatchRelease: "1.5.8"
-    endOfLifeDate: 2017-10-01
-  - release: "1.4"
-    finalPatchRelease: "1.4.12"
-    endOfLifeDate: 2017-04-21
-  - release: "1.3"
-    finalPatchRelease: "1.3.10"
-    endOfLifeDate: 2016-11-01
-  - release: "1.2"
-    finalPatchRelease: "1.2.7"
-    endOfLifeDate: 2016-10-23
+- endOfLifeDate: "2024-02-28"
+  finalPatchRelease: 1.26.15
+  note: 1.26.15 was released in March 2024 (after the EOL date) to pick up a new version
+    of Go to [address several Go CVEs](https://groups.google.com/g/golang-dev/c/o1I1Vv8Rfgs/m/Wr8tD1RlAgAJ)
+  release: "1.26"
+- endOfLifeDate: "2023-10-28"
+  finalPatchRelease: 1.25.16
+  note: 1.25.16 was released in November 2023 (after the EOL date) to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
+  release: "1.25"
+- endOfLifeDate: "2023-07-28"
+  finalPatchRelease: 1.24.17
+  note: 1.24.17 was released in August 2023 (after the EOL date) to fix CVE-2023-3676
+    and CVE-2023-3955
+  release: "1.24"
+- endOfLifeDate: "2023-02-28"
+  finalPatchRelease: 1.23.17
+  release: "1.23"
+- endOfLifeDate: "2022-12-08"
+  finalPatchRelease: 1.22.17
+  note: 1.22.17 was released in December 2022 (after the EOL date) to backport registry
+    changes and fix two critical issues.
+  release: "1.22"
+- endOfLifeDate: "2022-11-09"
+  finalPatchRelease: 1.22.16
+  note: 1.22.16 was released in November 2022 (after the EOL date) to fix CVE-2022-3162
+    and CVE-2022-3294.
+  release: "1.22"
+- endOfLifeDate: "2022-10-28"
+  finalPatchRelease: 1.22.15
+  release: "1.22"
+- endOfLifeDate: "2022-06-28"
+  finalPatchRelease: 1.21.14
+  release: "1.21"
+- endOfLifeDate: "2022-02-28"
+  finalPatchRelease: 1.20.15
+  release: "1.20"
+- endOfLifeDate: "2021-10-28"
+  finalPatchRelease: 1.19.16
+  release: "1.19"
+- endOfLifeDate: "2021-06-18"
+  finalPatchRelease: 1.18.20
+  note: Created to solve regression introduced in 1.18.19
+  release: "1.18"
+- endOfLifeDate: "2021-05-12"
+  finalPatchRelease: 1.18.19
+  note: '[Regression](https://groups.google.com/g/kubernetes-dev/c/KuF8s2zueFs)'
+  release: "1.18"
+- endOfLifeDate: "2021-01-13"
+  finalPatchRelease: 1.17.17
+  release: "1.17"
+- endOfLifeDate: "2020-09-02"
+  finalPatchRelease: 1.16.15
+  release: "1.16"
+- endOfLifeDate: "2020-05-06"
+  finalPatchRelease: 1.15.12
+  release: "1.15"
+- endOfLifeDate: "2019-12-11"
+  finalPatchRelease: 1.14.10
+  release: "1.14"
+- endOfLifeDate: "2019-10-15"
+  finalPatchRelease: 1.13.12
+  release: "1.13"
+- endOfLifeDate: "2019-07-08"
+  finalPatchRelease: 1.12.10
+  release: "1.12"
+- endOfLifeDate: "2019-05-01"
+  finalPatchRelease: 1.11.10
+  release: "1.11"
+- endOfLifeDate: "2019-02-13"
+  finalPatchRelease: 1.10.13
+  release: "1.10"
+- endOfLifeDate: "2018-09-29"
+  finalPatchRelease: 1.9.11
+  release: "1.9"
+- endOfLifeDate: "2018-07-12"
+  finalPatchRelease: 1.8.15
+  release: "1.8"
+- endOfLifeDate: "2018-04-04"
+  finalPatchRelease: 1.7.16
+  release: "1.7"
+- endOfLifeDate: "2017-11-23"
+  finalPatchRelease: 1.6.13
+  release: "1.6"
+- endOfLifeDate: "2017-10-01"
+  finalPatchRelease: 1.5.8
+  release: "1.5"
+- endOfLifeDate: "2017-04-21"
+  finalPatchRelease: 1.4.12
+  release: "1.4"
+- endOfLifeDate: "2016-11-01"
+  finalPatchRelease: 1.3.10
+  release: "1.3"
+- endOfLifeDate: "2016-10-23"
+  finalPatchRelease: 1.2.7
+  release: "1.2"
diff --git a/data/releases/schedule.yaml b/data/releases/schedule.yaml
index 022692f89e..1379caca10 100644
--- a/data/releases/schedule.yaml
+++ b/data/releases/schedule.yaml
@@ -1,123 +1,131 @@
----
-# This file helps to populate the /releases page, and is also parsed to find out the
-# latest patch version for a minor release.
 schedules:
-- release: 1.30
-  releaseDate: 2024-04-17
+- endOfLifeDate: "2025-06-28"
+  maintenanceModeStartDate: "2025-04-28"
   next:
+    cherryPickDeadline: "2024-05-10"
     release: 1.30.1
-    cherryPickDeadline: 2024-05-10
-    targetDate: 2024-05-15
-  maintenanceModeStartDate: 2025-04-28
-  endOfLifeDate: 2025-06-28
-- release: 1.29
-  releaseDate: 2023-12-13
+    targetDate: "2024-05-15"
+  previousPatches:
+  - release: 1.30.0
+    targetDate: "2024-04-17"
+  release: "1.30"
+  releaseDate: "2024-04-17"
+- endOfLifeDate: "2025-02-28"
+  maintenanceModeStartDate: "2024-12-28"
   next:
+    cherryPickDeadline: "2024-05-10"
+    release: 1.29.5
+    targetDate: "2024-05-14"
+  previousPatches:
+  - cherryPickDeadline: "2024-04-12"
     release: 1.29.4
-    cherryPickDeadline: 2024-04-12
-    targetDate: 2024-04-16
-  maintenanceModeStartDate: 2024-12-28
-  endOfLifeDate: 2025-02-28
-  previousPatches:
-    - release: 1.29.3
-      cherryPickDeadline: 2024-03-08
-      targetDate: 2024-03-12
-    - release: 1.29.2
-      cherryPickDeadline: 2024-02-09
-      targetDate: 2024-02-14
-    - release: 1.29.1
-      cherryPickDeadline: 2024-01-12
-      targetDate: 2024-01-17
-    - release: 1.29.0
-      targetDate: 2023-12-13 
-- release: 1.28
-  releaseDate: 2023-08-15
+    targetDate: "2024-04-16"
+  - cherryPickDeadline: "2024-03-08"
+    release: 1.29.3
+    targetDate: "2024-03-12"
+  - cherryPickDeadline: "2024-02-09"
+    release: 1.29.2
+    targetDate: "2024-02-14"
+  - cherryPickDeadline: "2024-01-12"
+    release: 1.29.1
+    targetDate: "2024-01-17"
+  - release: 1.29.0
+    targetDate: "2023-12-13"
+  release: "1.29"
+  releaseDate: "2023-12-13"
+- endOfLifeDate: "2024-10-28"
+  maintenanceModeStartDate: "2024-08-28"
   next:
+    cherryPickDeadline: "2024-05-10"
+    release: 1.28.10
+    targetDate: "2024-05-14"
+  previousPatches:
+  - cherryPickDeadline: "2024-04-12"
     release: 1.28.9
-    cherryPickDeadline: 2024-04-12
-    targetDate: 2024-04-16
-  maintenanceModeStartDate: 2024-08-28
-  endOfLifeDate: 2024-10-28
-  previousPatches:
-    - release:  1.28.8
-      cherryPickDeadline: 2024-03-08
-      targetDate: 2024-03-12
-    - release: 1.28.7
-      cherryPickDeadline: 2024-02-09
-      targetDate: 2024-02-14
-    - release: 1.28.6
-      cherryPickDeadline: 2023-01-12
-      targetDate: 2024-01-17
-    - release: 1.28.5
-      cherryPickDeadline: 2023-12-15
-      targetDate: 2023-12-20
-    - release: 1.28.4
-      cherryPickDeadline: ""
-      targetDate: 2023-11-14
-      note: >-
-        Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
-    - release: 1.28.3
-      cherryPickDeadline: 2023-10-13
-      targetDate: 2023-10-18
-    - release: 1.28.2
-      cherryPickDeadline: 2023-09-08
-      targetDate: 2023-09-13      
-    - release: 1.28.1
-      cherryPickDeadline: N/A
-      targetDate: 2023-08-23
-      note: >-
-        Unplanned release to include CVE fixes
-    - release: 1.28.0
-      targetDate: 2023-08-15
-- release: 1.27
-  releaseDate: 2023-04-11
-  maintenanceModeStartDate: 2024-04-28
-  endOfLifeDate: 2024-06-28
+    targetDate: "2024-04-16"
+  - cherryPickDeadline: "2024-03-08"
+    release: 1.28.8
+    targetDate: "2024-03-12"
+  - cherryPickDeadline: "2024-02-09"
+    release: 1.28.7
+    targetDate: "2024-02-14"
+  - cherryPickDeadline: "2023-01-12"
+    release: 1.28.6
+    targetDate: "2024-01-17"
+  - cherryPickDeadline: "2023-12-15"
+    release: 1.28.5
+    targetDate: "2023-12-20"
+  - note: Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
+    release: 1.28.4
+    targetDate: "2023-11-14"
+  - cherryPickDeadline: "2023-10-13"
+    release: 1.28.3
+    targetDate: "2023-10-18"
+  - cherryPickDeadline: "2023-09-08"
+    release: 1.28.2
+    targetDate: "2023-09-13"
+  - cherryPickDeadline: N/A
+    note: Unplanned release to include CVE fixes
+    release: 1.28.1
+    targetDate: "2023-08-23"
+  - release: 1.28.0
+    targetDate: "2023-08-15"
+  release: "1.28"
+  releaseDate: "2023-08-15"
+- endOfLifeDate: "2024-06-28"
+  maintenanceModeStartDate: "2024-04-28"
   next:
-    release: 1.27.13
-    cherryPickDeadline: 2024-04-12
-    targetDate: 2024-04-16
+    cherryPickDeadline: "2024-05-10"
+    release: 1.27.14
+    targetDate: "2024-05-14"
   previousPatches:
-    - release: 1.27.12
-      cherryPickDeadline: 2024-03-08
-      targetDate: 2024-03-13
-    - release: 1.27.11
-      cherryPickDeadline: 2024-02-09
-      targetDate: 2024-02-14
-    - release: 1.27.10
-      cherryPickDeadline: 2023-01-12
-      targetDate: 2024-01-17
-    - release: 1.27.9
-      cherryPickDeadline: 2023-12-15
-      targetDate: 2023-12-20
-    - release: 1.27.8
-      cherryPickDeadline: ""
-      targetDate: 2023-11-14
-      note: >-
-        Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
-    - release: 1.27.7
-      cherryPickDeadline: 2023-10-13
-      targetDate: 2023-10-18
-    - release: 1.27.6
-      cherryPickDeadline: 2023-09-08
-      targetDate: 2023-09-13
-    - release: 1.27.5
-      cherryPickDeadline: 2023-08-04
-      targetDate: 2023-08-23
-    - release: 1.27.4
-      cherryPickDeadline: 2023-07-14
-      targetDate: 2023-07-19
-    - release: 1.27.3
-      cherryPickDeadline: 2023-06-09
-      targetDate: 2023-06-14
-    - release: 1.27.2
-      cherryPickDeadline: 2023-05-12
-      targetDate: 2023-05-17
-    - release: 1.27.1
-      cherryPickDeadline: ""
-      targetDate: 2023-04-14
-      note: >-
-        [Regression](https://groups.google.com/g/kubernetes-announce/c/9FTKjmIFOTw/m/TH6cJT64AAAJ)
-    - release: 1.27.0
-      cherryPickDeadline: ""
-      targetDate: 2023-04-11
+  - cherryPickDeadline: "2024-04-12"
+    release: 1.27.13
+    targetDate: "2024-04-16"
+  - cherryPickDeadline: "2024-03-08"
+    release: 1.27.12
+    targetDate: "2024-03-13"
+  - cherryPickDeadline: "2024-02-09"
+    release: 1.27.11
+    targetDate: "2024-02-14"
+  - cherryPickDeadline: "2023-01-12"
+    release: 1.27.10
+    targetDate: "2024-01-17"
+  - cherryPickDeadline: "2023-12-15"
+    release: 1.27.9
+    targetDate: "2023-12-20"
+  - note: Out of band release to fix [CVE-2023-5528](https://groups.google.com/g/kubernetes-announce/c/c3py6Fw0DTI/m/cScFSdk1BwAJ)
+    release: 1.27.8
+    targetDate: "2023-11-14"
+  - cherryPickDeadline: "2023-10-13"
+    release: 1.27.7
+    targetDate: "2023-10-18"
+  - cherryPickDeadline: "2023-09-08"
+    release: 1.27.6
+    targetDate: "2023-09-13"
+  - cherryPickDeadline: "2023-08-04"
+    release: 1.27.5
+    targetDate: "2023-08-23"
+  - cherryPickDeadline: "2023-07-14"
+    release: 1.27.4
+    targetDate: "2023-07-19"
+  - cherryPickDeadline: "2023-06-09"
+    release: 1.27.3
+    targetDate: "2023-06-14"
+  - cherryPickDeadline: "2023-05-12"
+    release: 1.27.2
+    targetDate: "2023-05-17"
+  - note: '[Regression](https://groups.google.com/g/kubernetes-announce/c/9FTKjmIFOTw/m/TH6cJT64AAAJ)'
+    release: 1.27.1
+    targetDate: "2023-04-14"
+  - release: 1.27.0
+    targetDate: "2023-04-11"
+  release: "1.27"
+  releaseDate: "2023-04-11"
+upcoming_releases:
+- cherryPickDeadline: "2024-05-10"
+  targetDate: "2024-05-14"
+- cherryPickDeadline: "2024-06-07"
+  targetDate: "2024-06-11"
+- cherryPickDeadline: "2024-07-05"
+  targetDate: "2024-07-09"
diff --git a/layouts/shortcodes/release-branches.html b/layouts/shortcodes/release-branches.html
index cdd07c0746..0ee1617c47 100644
--- a/layouts/shortcodes/release-branches.html
+++ b/layouts/shortcodes/release-branches.html
@@ -1,6 +1,6 @@
 {{ range $releaseInfo := .Site.Data.releases.schedule.schedules }}
-{{- $version := printf "%.2f" $releaseInfo.release -}}
-{{- $dataIdVersion := replace ( printf "%.2f" $releaseInfo.release ) "." "-" | anchorize -}}
+{{- $version := printf "%s" $releaseInfo.release -}}
+{{- $dataIdVersion := replace ( printf "%s" $releaseInfo.release ) "." "-" | anchorize -}}
 
 <h3 id="{{ $dataIdVersion }}">{{ $version }}</h3>
 <p>
diff --git a/layouts/shortcodes/release-data.html b/layouts/shortcodes/release-data.html
index e021b38799..0c69232fb1 100644
--- a/layouts/shortcodes/release-data.html
+++ b/layouts/shortcodes/release-data.html
@@ -1,6 +1,6 @@
 {{ range $data := .Site.Data.releases.schedule.schedules }}
-{{- $dataVersion := printf "%.2f" $data.release  -}}
-{{- $dataIdVersion := replace ( printf "%.2f" $data.release ) "." "-" | anchorize -}}
+{{- $dataVersion := printf "%s" $data.release  -}}
+{{- $dataIdVersion := replace ( printf "%s" $data.release ) "." "-" | anchorize -}}
 <h3 id="release-v{{ $dataIdVersion }}">{{ $dataVersion }}</h3>
 
 <div class="release-details">