Merge pull request #13592 from canonical/k8s-bubble-refresh

K8s bubble refresh

redirects.yaml

@@ -587,6 +587,7 @@ kubuntu/simple/oneiric/desktop/kubuntu-11\.10-desktop-amd64\.iso\.torrent/?: "ht
 kubernetes/features/?: "/kubernetes/charmed-k8s"
 kubernetes/partners/?: "/kubernetes"
 kubernetes/cloud-native-kubernetes-usage-report-2021/?: "https://juju.is/cloud-native-kubernetes-usage-report-2021"
+kubernetes/kubernetes-operations-survey/?: "/kubernetes"
 landscape/pricing: "/landscape/compare"
 landscape/install: "/landscape/docs/quickstart-deployment"
 legal/bootstack/?:  "/legal/managed-services"

static/js/src/chart-data.js

@@ -1043,6 +1043,21 @@ export var kubernetesReleases = [
   },
 ];
 
+export var kubernetesReleasesLTS = [
+  {
+    startDate: new Date("2024-12-01T00:00:00"),
+    endDate: new Date("2034-12-01T00:00:00"),
+    taskName: "Kubernetes 1.32x LTS",
+    status: "CANONICAL_KUBERNETES_SUPPORT",
+  },
+  {
+    startDate: new Date("2034-12-01T00:00:00"),
+    endDate: new Date("2036-12-01T00:00:00"),
+    taskName: "Kubernetes 1.32x LTS",
+    status: "CANONICAL_KUBERNETES_EXPANDED_SECURITY_MAINTENANCE",
+  },
+];
+
 export var microStackReleases = [
   {
     startDate: new Date("2026-04-01T00:00:00"),
@@ -1324,6 +1339,8 @@ export var kubernetesReleaseNames = [
   "Kubernetes 1.26",
 ];
 
+export var kubernetesReleaseNamesLTS = ["Kubernetes 1.32x LTS"];
+
 export var kernelReleaseScheduleNames = [
   "Ubuntu 14.04 LTS (v3.13)",
   "Ubuntu 16.04 LTS (v4.4)",

static/js/src/release-chart-manager.js

@@ -14,6 +14,7 @@ import {
   kernelReleasesLTS,
   openStackReleases,
   kubernetesReleases,
+  kubernetesReleasesLTS,
   microStackReleases,
   desktopServerStatus,
   kernelStatus,
@@ -36,6 +37,7 @@ import {
   kernelReleaseNamesALL,
   openStackReleaseNames,
   kubernetesReleaseNames,
+  kubernetesReleaseNamesLTS,
   microStackReleaseNames,
 } from "./chart-data.js";
 
@@ -154,6 +156,14 @@ function buildCharts() {
       true,
     );
   }
+  if (document.querySelector("#kubernetes-lts")) {
+    createReleaseChartOld(
+      "#kubernetes-lts",
+      kubernetesReleaseNamesLTS,
+      kubernetesStatus,
+      kubernetesReleasesLTS,
+    );
+  }
   if (document.querySelector("#kernel-schedule")) {
     createReleaseChartOld(
       "#kernel-schedule",
@@ -229,6 +239,10 @@ function clearCharts() {
   if (kubernetesEol) {
     kubernetesEol.innerHTML = "";
   }
+  const kubernetesLTS = document.querySelector("#kubernetes-lts");
+  if (kubernetesLTS) {
+    kubernetesLTS.innerHTML = "";
+  }
   const kernelSchedule = document.querySelector("#kernel-schedule");
   if (kernelSchedule) {
     kernelSchedule.innerHTML = "";

static/sass/styles.scss

@@ -1766,3 +1766,17 @@ legend {
     height: 15rem;
   }
 }
+
+.u-horizontal-nudge {
+  @media screen and ($breakpoint-large <= width) {
+    margin-left: $spv--small;
+  }
+}
+
+.u-vertical-nudge {
+  margin-bottom: $spv--small !important;
+}
+
+.p-table--mobile-card tr td {
+  white-space: normal;
+}

templates/about/release-cycle.html

@@ -98,8 +98,7 @@ <h3>Version numbers are YY.MM</h3>
         </p>
 
         <p>
-          Optional Legacy support add-on on top of Ubuntu Pro extends the security maintenance and support for an additional 2 years, resulting in 12 years coverage overall.
-        </p>
+          Add on optional Legacy Support to Ubuntu Pro and expand security maintenance and support for an additional 2 years, resulting in 12 years of coverage overall.</p>
 
         <p>
           Every six months between LTS versions, Canonical publishes an interim release of Ubuntu, with {{ releases.latest.short_version }} being the latest example. These are production-quality releases and are supported for 9 months, with sufficient time provided for users to update, but these releases do not receive the long-term commitment of LTS releases.
@@ -329,8 +328,39 @@ <h3>MicroStack</h3>
       <div class="u-fixed-width">
         <h2>Canonical Kubernetes release cycle</h2>
 
+        <h3>Canonical Kubernetes</h3>
+
+        <p>
+          Canonical now offers 12 years of security maintenance and support for Kubernetes with an <a href="/support">Ubuntu Pro</a> subscription, starting with Kubernetes 1.32.
+        </p>
+
+        <p>
+          Canonical will release a Kubernetes LTS every two years, aligned with the Ubuntu LTS cycle. Canonical will also provide upstream Kubernetes releases, with a new version every four months.
+        </p>
+
+        <p>
+          With the Ubuntu Pro subscription you get 10 years of security maintenance and support for the Canonical Kubernetes snap and built-in features: network, DNS, local storage, load balancer, gateway, ingress and metrics server. Upstream updates and fixes to snap components, provided as binaries or container images, will be included in the Canonical Kubernetes.
+        </p>
+
+        <p>
+          The optional Legacy Support add-on on top of Ubuntu Pro extends the security maintenance and support for an additional 2 years, resulting in 12 years coverage overall.
+        </p>
+
+        <p>
+          The Canonical Kubernetes support lifecycle can be represented this way:
+        </p>
+
+
+        {% include "/about/release_cycles/k8s-lts.html" %}
+
+        <p>
+For more information on previous and current releases, please see the <a href="https://documentation.ubuntu.com/canonical-kubernetes/latest/releases/">Canonical Kubernetes</a> release notes.
+        </p>
+
+        <h3>Charmed Kubernetes and MicroK8s</h3>
+
         <p>
-          The release cycles of Charmed Kubernetes and MicroK8s are tightly synchronised to the release of upstream Kubernetes<sup>&reg;</sup>. The current release and two prior releases are supported (N-2), subject to changes in the upstream release cycle. Canonical also provides expanded security maintenance (ESM) for N-4 Kubernetes releases in the stable release channel.
+          The release cycles of Charmed Kubernetes and MicroK8s are tightly synchronised to the release of upstream Kubernetes<sup>&reg;</sup>. The current release and two prior releases are supported (N-2), subject to changes in the upstream release cycle. Canonical also provides Expanded Security Maintenance (ESM) for N-4 Kubernetes releases in the stable release channel.
         </p>
 
         <p>
@@ -341,7 +371,7 @@ <h2>Canonical Kubernetes release cycle</h2>
           ESM support includes fixes to high and critical CVEs related to Kubernetes charms and MicroK8s (snap), in the current N-4 support window. Upstream updates and fixes to Kubernetes binaries or container images are absorbed by Charmed Kubernetes and MicroK8s.
         </p>
 
-        <p>The Canonical Kubernetes support lifecycle can be represented this way:</p>
+        <p>The Charmed Kubernetes and MicroK8s support lifecycle can be represented this way:</p>
       </div>
 
       {% include "/about/release_cycles/k8s-eol.html" %}

templates/about/release_cycles/k8s-eol.html

@@ -50,4 +50,4 @@
       </tbody>
     </table>
   </div>
-</div>
+</div>

templates/about/release_cycles/k8s-lts.html

@@ -0,0 +1,23 @@
+<div class="row">
+  <div class="col-10" style="overflow: auto;">
+    <div class="p-section--shallow u-hide--small" id="kubernetes-lts"></div>
+    <table>
+      <thead>
+        <tr>
+          <th>Release</th>
+          <th>Released</th>
+          <th>End of Ubuntu Pro support</th>
+          <th>End of Legacy support</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><strong>1.32x LTS</strong></td>
+          <td>Dec 2024</td>
+          <td>Dec 2034</td>
+          <td>Dec 2036</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>