diff --git a/linkerd.io/content/2.15/tasks/upgrade.md b/linkerd.io/content/2.15/tasks/upgrade.md index 4a35e5bf1f..1e757fa722 100644 --- a/linkerd.io/content/2.15/tasks/upgrade.md +++ b/linkerd.io/content/2.15/tasks/upgrade.md @@ -106,16 +106,10 @@ the version-specific upgrade notes before proceeding. ### Edge releases For edge releases, it is also usually safe to upgrade one major version at a -time. The "major version" of an edge release is indicated by the most recent -`version-2.X` tag before the edge release tag in question; this is also -included in the release notes for each edge release. - -For example, `edge-24.4.1` is within major version 2.15: the most recent -`version-2.X` tag before `edge-24.4.1` is -[`version-2.15`](https://github.com/linkerd/linkerd2/releases/tag/version-2.15), -which corresponds to `edge-24.2.4`. Therefore, it should be safe to upgrade -from `edge-24.2.4` to any edge release within 2.15 or 2.16, but not to any -edge release produced after `version-2.17` is tagged. +time. The major version of an edge release is included in the release notes +for each edge release: for example, `edge-24.4.1` is part of Linkerd 2.15, so +it should be safe to upgrade from `edge-24.2.4` to any edge release within +Linkerd 2.15 or Linkerd 2.16. For any situation where this is not the case, the edge release guidance will have more information. diff --git a/linkerd.io/content/releases/_index.md b/linkerd.io/content/releases/_index.md index 727a580810..8c9ab99929 100644 --- a/linkerd.io/content/releases/_index.md +++ b/linkerd.io/content/releases/_index.md @@ -54,6 +54,14 @@ digits of the year, `m` is the numeric month, and `n` is numeric edge release count for that month. For example, `edge-24.1.3` is the third edge release shipped in January 2024. +Each edge release is also part of a specific major version of Linkerd. The +major version of an edge release is indicated by the most recent `version-2.X` +tag before the edge release tag in question; this is also included in the +release notes for each edge release. For example, `edge-24.4.1` is part of +Linkerd 2.15: the most recent `version-2.X` tag before `edge-24.4.1` is +[`version-2.15`](https://github.com/linkerd/linkerd2/releases/tag/version-2.15), +which corresponds to `edge-24.2.4`. + Using edge release artifacts and reporting bugs helps us ensure a rapid pace of development and is a great way to help Linkerd. We publish edge release guidance as part of the release notes and strive to always provide production-ready