patch-releases: Update cycle after May releases and EOL 1.18

Signed-off-by: Stephen Augustus <[email protected]>
Co-authored-by: Carlos Panato <[email protected]>

Author: justaugustus

content/en/releases/patch-releases.md

@@ -78,9 +78,10 @@ releases may also occur in between these.
 
 | Monthly Patch Release | Target date |
 | --- | --- |
-| May 2021 | 2021-05-12 |
 | June 2021 | 2021-06-16 |
 | July 2021 | 2021-07-14 |
+| August 2021 | 2021-08-11 |
+| September 2021 | 2021-09-15 |
 
 ## Detailed Release History for Active Branches
 
@@ -92,6 +93,7 @@ End of Life for **1.21** is **2022-06-28**
 
 | PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
 |--- |--- |--- |
+| 1.21.2        | 2021-06-12           | 2021-06-16  |
 | 1.21.1        | 2021-05-07           | 2021-05-12  |
 
 ### 1.20
@@ -102,6 +104,7 @@ End of Life for **1.20** is **2022-02-28**
 
 | PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
 |--- |--- |--- |
+| 1.20.8        | 2021-06-12           | 2021-06-16  |
 | 1.20.7        | 2021-05-07           | 2021-05-12  |
 | 1.20.6        | 2021-04-09           | 2021-04-14  |
 | 1.20.5        | 2021-03-12           | 2021-03-17  |
@@ -118,6 +121,7 @@ End of Life for **1.19** is **2021-10-28**
 
 | PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
 |--- |--- |--- |
+| 1.19.12       | 2021-06-12           | 2021-06-16  |
 | 1.19.11       | 2021-05-07           | 2021-05-12  |
 | 1.19.10       | 2021-04-09           | 2021-04-14  |
 | 1.19.9        | 2021-03-12           | 2021-03-17  |
@@ -130,40 +134,13 @@ End of Life for **1.19** is **2021-10-28**
 | 1.19.2        | 2020-09-11           | 2020-09-16  |
 | 1.19.1        | 2020-09-04           | 2020-09-09  |
 
-### 1.18
-
-**1.18** enters maintenance mode on **2021-04-28**
-
-End of Life for **1.18** is **2021-05-12**
-
-| PATCH RELEASE | CHERRY PICK DEADLINE | TARGET DATE |
-|--- |--- |--- |
-| 1.18.19       | 2021-05-07           | 2021-05-12  |
-| 1.18.18       | 2021-04-09           | 2021-04-14  |
-| 1.18.17       | 2021-03-12           | 2021-03-17  |
-| 1.18.16       | 2021-02-12           | 2021-02-17  |
-| 1.18.15       | 2021-01-08           | 2021-01-13  |
-| 1.18.14       | [Tagging Issue](https://groups.google.com/g/kubernetes-dev/c/dNH2yknlCBA) | 2020-12-18  |
-| 1.18.13       | 2020-12-04           | 2020-12-09  |
-| 1.18.12       | N/A                  | 2020-11-12  |
-| 1.18.11       | [No-op release](https://groups.google.com/g/kubernetes-dev/c/nJix1xLQvZE) | 2020-11-11  |
-| 1.18.10       | 2020-10-09           | 2020-10-14  |
-| 1.18.9        | 2020-09-11           | 2020-09-16  |
-| 1.18.8        | N/A                  | 2020-08-13  |
-| 1.18.7        | 2020-08-07           | 2020-08-12  |
-| 1.18.6        | 2020-07-10           | 2020-07-15  |
-| 1.18.5        | 2020-06-25           | 2020-06-26  |
-| 1.18.4        | 2020-06-12           | 2020-06-17  |
-| 1.18.3        | 2020-05-15           | 2020-05-20  |
-| 1.18.2        | 2020-04-13           | 2020-04-16  |
-| 1.18.1        | 2020-04-06           | 2020-04-08  |
-
 ## Non-Active Branch History
 
 These releases are no longer supported.
 
 | Minor Version | Final Patch Release | EOL date |
 | --- | --- | --- |
+| 1.18 | 1.18.19 | 2021-05-12 |
 | 1.17 | 1.17.17 | 2021-01-13 |
 | 1.16 | 1.16.15 | 2020-09-02 |
 | 1.15 | 1.15.12 | 2020-05-06 |

data/releases/schedule.yaml

@@ -1,16 +1,22 @@
 schedules:
 - release: 1.21
-  next: 1.21.1
-  cherryPickDeadline: 2021-05-07
-  targetDate: 2021-05-12
+  next: 1.21.2
+  cherryPickDeadline: 2021-06-12
+  targetDate: 2021-06-16
   endOfLifeDate: 2022-04-30
   previousPatches:
+    - release: 1.21.1
+      cherryPickDeadline: 2021-05-07
+      targetDate: 2021-05-12
 - release: 1.20
-  next: 1.20.7
-  cherryPickDeadline: 2021-05-07
-  targetDate: 2021-05-12
+  next: 1.20.8
+  cherryPickDeadline: 2021-06-12
+  targetDate: 2021-06-16
   endOfLifeDate: 2021-12-30
   previousPatches:
+    - release: 1.20.7
+      cherryPickDeadline: 2021-05-07
+      targetDate: 2021-05-12
     - release: 1.20.6
       cherryPickDeadline: 2021-04-09
       targetDate: 2021-04-14
@@ -30,11 +36,14 @@ schedules:
       cherryPickDeadline: "Tagging Issue https://groups.google.com/g/kubernetes-dev/c/dNH2yknlCBA"
       targetDate: 2020-12-18
 - release: 1.19
-  next: 1.19.11
-  cherryPickDeadline: 2021-05-07
-  targetDate: 2021-05-12
+  next: 1.19.12
+  cherryPickDeadline: 2021-06-12
+  targetDate: 2021-06-16
   endOfLifeDate: 2021-09-30
   previousPatches:
+    - release: 1.19.11
+      cherryPickDeadline: 2021-05-07
+      targetDate: 2021-05-12
     - release: 1.19.10
       cherryPickDeadline: 2021-04-09
       targetDate: 2021-04-14