Skip to content

Commit

Permalink
Merge pull request #12395 from stonepreston/1-26-chart-updates
Browse files Browse the repository at this point in the history 
1 26 chart updates
  • Loading branch information
@carkod
carkod authored Jan 5, 2023
2 parents a66a2d1 + 7196cd9 commit 53a5d19
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 32 deletions.
71 changes: 42 additions & 29 deletions static/js/src/chart-data.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1238,145 +1238,157 @@ export var kubernetesReleases = [
startDate: new Date("2019-03-27T00:00:00"),
endDate: new Date("2019-12-17T00:00:00"),
taskName: "Kubernetes 1.14",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2019-12-17T00:00:00"),
endDate: new Date("2020-09-30T00:00:00"),
taskName: "Kubernetes 1.14",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2019-06-28T00:00:00"),
endDate: new Date("2020-04-13T00:00:00"),
taskName: "Kubernetes 1.15",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2020-04-13T00:00:00"),
endDate: new Date("2020-12-16T00:00:00"),
taskName: "Kubernetes 1.15",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2019-09-27T00:00:00"),
endDate: new Date("2020-09-30T00:00:00"),
taskName: "Kubernetes 1.16",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2020-09-30T00:00:00"),
endDate: new Date("2021-04-15T00:00:00"),
taskName: "Kubernetes 1.16",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2019-12-17T00:00:00"),
endDate: new Date("2020-12-16T00:00:00"),
taskName: "Kubernetes 1.17",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2020-12-16T00:00:00"),
endDate: new Date("2021-09-01T00:00:00"),
taskName: "Kubernetes 1.17",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2020-04-13T00:00:00"),
endDate: new Date("2021-04-15T00:00:00"),
taskName: "Kubernetes 1.18",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2021-04-15T00:00:00"),
endDate: new Date("2021-12-15T00:00:00"),
taskName: "Kubernetes 1.18",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2020-09-30T00:00:00"),
endDate: new Date("2021-09-01T00:00:00"),
taskName: "Kubernetes 1.19",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2021-09-01T00:00:00"),
endDate: new Date("2022-05-06T00:00:00"),
taskName: "Kubernetes 1.19",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2020-12-16T00:00:00"),
endDate: new Date("2021-12-15T00:00:00"),
taskName: "Kubernetes 1.20",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2021-12-15T00:00:00"),
endDate: new Date("2022-09-01T00:00:00"),
taskName: "Kubernetes 1.20",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2021-04-15T00:00:00"),
endDate: new Date("2022-05-06T00:00:00"),
taskName: "Kubernetes 1.21",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2022-05-06T00:00:00"),
endDate: new Date("2022-12-06T00:00:00"),
endDate: new Date("2022-12-15T00:00:00"),
taskName: "Kubernetes 1.21",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2021-09-01T00:00:00"),
endDate: new Date("2022-09-01T00:00:00"),
taskName: "Kubernetes 1.22",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2022-08-23T00:00:00"),
endDate: new Date("2023-05-03T00:00:00"),
taskName: "Kubernetes 1.22",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2021-12-15T00:00:00"),
endDate: new Date("2022-12-06T00:00:00"),
endDate: new Date("2022-12-15T00:00:00"),
taskName: "Kubernetes 1.23",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2022-12-06T00:00:00"),
startDate: new Date("2022-12-15T00:00:00"),
endDate: new Date("2023-08-23T00:00:00"),
taskName: "Kubernetes 1.23",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2022-05-06T00:00:00"),
endDate: new Date("2023-05-03T00:00:00"),
taskName: "Kubernetes 1.24",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2023-05-03T00:00:00"),
endDate: new Date("2023-12-06T00:00:00"),
taskName: "Kubernetes 1.24",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2022-09-01T00:00:00"),
endDate: new Date("2023-08-23T00:00:00"),
taskName: "Kubernetes 1.25",
status: "CHARMED_KUBERNETES_SUPPORT",
status: "CANONICAL_KUBERNETES_SUPPORT",
},
{
startDate: new Date("2023-08-23T00:00:00"),
endDate: new Date("2024-05-03T00:00:00"),
taskName: "Kubernetes 1.25",
status: "CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
{
startDate: new Date("2022-12-15T00:00:00"),
endDate: new Date("2023-12-15T00: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"),
taskName: "Kubernetes 1.26",
status: "CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE",
},
];

Expand Down Expand Up @@ -1418,8 +1430,8 @@ export var openStackStatus = {
};

export var kubernetesStatus = {
CHARMED_KUBERNETES_SUPPORT: "chart__bar--orange",
CHARMED_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE: "chart__bar--aubergine",
CANONICAL_KUBERNETES_SUPPORT: "chart__bar--orange",
CANONICAL_KUBERNETES_EXTENDED_SECURITY_MAINTENANCE: "chart__bar--aubergine",
};

export var smallReleaseNames = [
Expand Down Expand Up @@ -1597,6 +1609,7 @@ export var openStackReleaseNames = [
];

export var kubernetesReleaseNames = [
"Kubernetes 1.26",
"Kubernetes 1.25",
"Kubernetes 1.24",
"Kubernetes 1.23",
Expand Down
6 changes: 3 additions & 3 deletions templates/about/release-cycle.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,15 +415,15 @@ <h2>OpenStack release cycle</h2>
<section class="p-tabs__content" id="canonical-kubernetes-release-cycle" role="tabpanel" aria-labelledby="canonical-kubernetes-release-cycle-tab">
<div class="p-strip is-shallow">
<div class="u-fixed-width">
<h2>Charmed Kubernetes release cycle</h2>
<h2>Canonical Kubernetes release cycle</h2>

<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 extended security maintenance (ESM) for N-4 Kubernetes releases in the stable release channel.</p>

<p>For <a href="/support">Ubuntu Advantage</a> support, users must upgrade to remain in the N-2 support window.</p>

<p>ESM support includes fixes to high and critical CVEs related to Kubernetes charms, limited to the LTS Ubuntu releases 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 Charmed Kubernetes support lifecycle can be represented this way:</p>
<p>The Canonical Kubernetes support lifecycle can be represented this way:</p>
</div>

<div class="row">
Expand Down Expand Up @@ -517,7 +517,7 @@ <h2>Charmed Kubernetes release cycle</h2>
</div>

<div class="u-fixed-width">
<p>For more information on previous and current releases, please see the <a href="/kubernetes/docs/release-notes">Charmed Kubernetes</a> release notes or the <a href="https://microk8s.io/docs/release-notes">MicroK8s release notes.</a></p>
<p>For more information on previous and current releases, please see the <a href="/kubernetes/docs/release-notes">Charmed Kubernetes release notes</a> or the <a href="https://microk8s.io/docs/release-notes">MicroK8s release notes.</a></p>
</div>
</div>
</section>
Expand Down

0 comments on commit 53a5d19

Please sign in to comment.