Merge pull request canonical#13250 from kwmonroe/k8s-128-release-cycle

adjust release-cycle dates for k8s 1.28
evilnick · Oct 17, 2023 · f7ffa06 · f7ffa06
2 parents 0d9b6c9 + 1db13ac
commit f7ffa06
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 13 deletions.
diff --git 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
@@ -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>
+  </div>