From 1db13ac95af879a7ba1edf87d424866f28064f1b Mon Sep 17 00:00:00 2001
From: Kevin W Monroe <kevin.monroe@canonical.com>
Date: Mon, 16 Oct 2023 09:07:46 -0500
Subject: [PATCH] adjust dates for k8s 1.28

- align current release support with upstream dates
- add 1.28 dates
---
 static/js/src/chart-data.js                 | 31 +++++++++++++++------
 templates/about/release_cycles/k8s-eol.html | 14 +++++++---
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/static/js/src/chart-data.js b/static/js/src/chart-data.js
index 6ca4350eb9a..9ec4b87d4be 100644
--- a/static/js/src/chart-data.js
+++ b/static/js/src/chart-data.js
@@ -1514,40 +1514,52 @@ export var kubernetesReleases = [
   },
   {
     startDate: new Date("2022-09-01T00:00:00"),
-    endDate: new Date("2023-08-23T00:00:00"),
+    endDate: new Date("2023-08-28T00:00:00"),
     taskName: "Kubernetes 1.25",
     status: "CANONICAL_KUBERNETES_SUPPORT",
   },
   {
-    startDate: new Date("2023-08-23T00:00:00"),
-    endDate: new Date("2024-05-03T00:00:00"),
+    startDate: new Date("2023-08-28T00:00:00"),
+    endDate: new Date("2024-04-28T00:00:00"),
     taskName: "Kubernetes 1.25",
     status: "CANONICAL_KUBERNETES_EXPANDED_SECURITY_MAINTENANCE",
   },
   {
     startDate: new Date("2022-12-15T00:00:00"),
-    endDate: new Date("2023-12-15T00:00:00"),
+    endDate: new Date("2023-12-28T00:00:00"),
     taskName: "Kubernetes 1.26",
     status: "CANONICAL_KUBERNETES_SUPPORT",
   },
   {
-    startDate: new Date("2023-12-15T00:00:00"),
-    endDate: new Date("2024-08-23T00:00:00"),
+    startDate: new Date("2023-12-28T00:00:00"),
+    endDate: new Date("2024-08-28T00:00:00"),
     taskName: "Kubernetes 1.26",
     status: "CANONICAL_KUBERNETES_EXPANDED_SECURITY_MAINTENANCE",
   },
   {
     startDate: new Date("2023-04-21T00:00:00"),
-    endDate: new Date("2024-04-21T00:00:00"),
+    endDate: new Date("2024-04-28T00:00:00"),
     taskName: "Kubernetes 1.27",
     status: "CANONICAL_KUBERNETES_SUPPORT",
   },
   {
-    startDate: new Date("2024-04-21T00:00:00"),
-    endDate: new Date("2024-12-06T00:00:00"),
+    startDate: new Date("2024-04-28T00:00:00"),
+    endDate: new Date("2024-12-28T00:00:00"),
     taskName: "Kubernetes 1.27",
     status: "CANONICAL_KUBERNETES_EXPANDED_SECURITY_MAINTENANCE",
   },
+  {
+    startDate: new Date("2023-08-18T00:00:00"),
+    endDate: new Date("2024-08-28T00:00:00"),
+    taskName: "Kubernetes 1.28",
+    status: "CANONICAL_KUBERNETES_SUPPORT",
+  },
+  {
+    startDate: new Date("2024-08-28T00:00:00"),
+    endDate: new Date("2025-04-28T00:00:00"),
+    taskName: "Kubernetes 1.28",
+    status: "CANONICAL_KUBERNETES_EXPANDED_SECURITY_MAINTENANCE",
+  },
 ];
 
 export var microStackReleases = [
@@ -1898,6 +1910,7 @@ export var microStackReleaseNames = [
 ];
 
 export var kubernetesReleaseNames = [
+  "Kubernetes 1.28",
   "Kubernetes 1.27",
   "Kubernetes 1.26",
   "Kubernetes 1.25",
diff --git a/templates/about/release_cycles/k8s-eol.html b/templates/about/release_cycles/k8s-eol.html
index 36cfd2559eb..93ab78df5ba 100644
--- a/templates/about/release_cycles/k8s-eol.html
+++ b/templates/about/release_cycles/k8s-eol.html
@@ -11,10 +11,16 @@
           </tr>
         </thead>
         <tbody>
+          <tr>
+            <td><strong>1.28.x</strong></td>
+            <td align='right'>Aug 2023</td>
+            <td align='right'>Aug 2024</td>
+            <td align='right'>Apr 2025</td>
+          </tr>
           <tr>
             <td><strong>1.27.x</strong></td>
-            <td align='right'>April 2023</td>
-            <td align='right'>April 2024</td>
+            <td align='right'>Apr 2023</td>
+            <td align='right'>Apr 2024</td>
             <td align='right'>Dec 2024</td>
           </tr>
           <tr>
@@ -27,7 +33,7 @@
             <td><strong>1.25.x</strong></td>
             <td align='right'>Sep 2022</td>
             <td align='right'>Aug 2023</td>
-            <td align='right'>May 2024</td>
+            <td align='right'>Apr 2024</td>
           </tr>
           <tr>
             <td><strong>1.24.x</strong></td>
@@ -98,4 +104,4 @@
         </tbody>
       </table>
     </div>
-  </div>
\ No newline at end of file
+  </div>