From 36ddc8a2c24870ae00d331f689396e1e9dd622b6 Mon Sep 17 00:00:00 2001 From: Flynn Date: Mon, 20 May 2024 23:46:06 -0400 Subject: [PATCH] Updates after feedback Signed-off-by: Flynn --- .../content/2.15/getting-started/_index.md | 17 +++++++--------- linkerd.io/content/2.15/tasks/install-helm.md | 20 +++++++++---------- linkerd.io/content/2.15/tasks/install.md | 16 +++++++-------- .../content/2.15/tasks/troubleshooting.md | 18 ++++++----------- linkerd.io/content/2.15/tasks/upgrade.md | 4 ++-- 5 files changed, 33 insertions(+), 42 deletions(-) diff --git a/linkerd.io/content/2.15/getting-started/_index.md b/linkerd.io/content/2.15/getting-started/_index.md index 7a57abab4c..886628e1d6 100644 --- a/linkerd.io/content/2.15/getting-started/_index.md +++ b/linkerd.io/content/2.15/getting-started/_index.md @@ -17,16 +17,13 @@ Welcome to Linkerd! 🎈 In this guide, we'll walk you through how to install the latest _edge release_ of Linkerd into your Kubernetes cluster. New edge releases usually appear weekly, and always represent the latest and greatest development work being -done on Linkerd. This means that edge releases always have the latest new -features and fixes, but of course they may also have bugs, work that's later -backed out, or breaking changes (though we try to avoid these things!). - -As of February 2024, the Linkerd project only produces edge releases. Using -them and [reporting -bugs](https://github.com/linkerd/linkerd2/issues/new/choose) is a great way to -help Linkerd! But if that isn't for you, no problem -- check out [Linkerd -releases](/releases/) for more about _stable releases_ from the vendor -community. +done on Linkerd. Using them and [reporting any +issues](https://github.com/linkerd/linkerd2/issues/new/choose) is a great way +to help Linkerd! + +You can also check out [Linkerd releases](/releases/) for more about _stable +releases_ from the vendor community. The Linkerd project itself only produces +edge releases. ## Overview diff --git a/linkerd.io/content/2.15/tasks/install-helm.md b/linkerd.io/content/2.15/tasks/install-helm.md index cd8d0b9992..ec629bb716 100644 --- a/linkerd.io/content/2.15/tasks/install-helm.md +++ b/linkerd.io/content/2.15/tasks/install-helm.md @@ -6,19 +6,19 @@ description = "Install Linkerd onto your Kubernetes cluster using Helm." Linkerd can be installed via Helm rather than with the `linkerd install` command. This is recommended for production, since it allows for repeatability. -{{< warning >}} +{{< note >}} -As of February 2024, the Linkerd project is no longer producing open source -stable release artifacts. As such, this page contains instructions for using -Helm to install the latest edge release of Linkerd, and `helm.linkerd.io` does -not contain Helm charts for stable releases after `stable-2.14`. If you have -installed a [stable distribution](/releases/#stable) of Linkerd, the vendor -should provide additional guidance on how to use Helm. +The Linkerd project itself only produces [edge releases](/releases/) (for more +information about the different kinds of Linkerd releases, see the [Releases +and Versions](/releases/) page). -You can find more information about the different kinds of Linkerd releases on -the [Releases and Versions](/releases/) page. +As such, this page contains instructions for using Helm to install the latest +edge release of Linkerd, and `helm.linkerd.io` does not contain Helm charts +for stable releases after `stable-2.14`. If you have installed a [stable +distribution](/releases/#stable) of Linkerd, the vendor should provide +additional guidance on how to use Helm. -{{< /warning >}} +{{< /note >}} ## Prerequisite: generate mTLS certificates diff --git a/linkerd.io/content/2.15/tasks/install.md b/linkerd.io/content/2.15/tasks/install.md index 7a24401df7..114235c5e1 100644 --- a/linkerd.io/content/2.15/tasks/install.md +++ b/linkerd.io/content/2.15/tasks/install.md @@ -12,18 +12,18 @@ Before you can use Linkerd, you'll need to install the [control plane](../../reference/architecture/#control-plane). This page covers how to accomplish that. -{{< warning >}} +{{< note >}} + +The Linkerd project itself only produces [edge releases](/releases/) (for more +information about the different kinds of Linkerd releases, see the [Releases +and Versions](/releases/) page). -As of February 2024, the Linkerd project is no longer producing open source -stable release artifacts. As such, this page contains instructions for -installing the latest edge release of Linkerd. If you have installed a [stable +As such, this page contains instructions for installing the latest edge +release of Linkerd. If you have installed a [stable distribution](/releases/#stable) of Linkerd, the vendor should provide additional guidance on installing Linkerd. -You can find more information about the different kinds of Linkerd releases on -the [Releases and Versions](/releases/) page. - -{{< /warning >}} +{{< /note >}} Linkerd's control plane can be installed in two ways: with the CLI and with Helm. The CLI is convenient and easy, but for production use cases we recommend diff --git a/linkerd.io/content/2.15/tasks/troubleshooting.md b/linkerd.io/content/2.15/tasks/troubleshooting.md index 202921f18d..0007cbe4b1 100644 --- a/linkerd.io/content/2.15/tasks/troubleshooting.md +++ b/linkerd.io/content/2.15/tasks/troubleshooting.md @@ -881,12 +881,9 @@ Example failures: unsupported version channel: stable-2.14.10 ``` -As of February 2024, the Linkerd project is no longer producing open source -stable release artifacts. Please read the -[2.15 announcement](/2024/02/21/announcing-linkerd-2.15/#a-new-model-for-stable-releases) -for details. - -See [the full list of Linkerd releases](/releases/) for ways to get Linkerd. +As of February 2024, the Linkerd project itself only produces [edge +releases](/releases/). For more details, read the [Releases and +Versions](/releases/) page. @@ -919,12 +916,9 @@ Example failures: unsupported version channel: stable-2.14.10 ``` -As of February 2024, the Linkerd project is no longer producing open source -stable release artifacts. Please read the -[2.15 announcement](/2024/02/21/announcing-linkerd-2.15/#a-new-model-for-stable-releases) -for details. - -See [the full list of Linkerd releases](/releases/) for ways to get Linkerd. +As of February 2024, the Linkerd project itself only produces [edge +releases](/releases/). For more details, read the [Releases and +Versions](/releases/) page. diff --git a/linkerd.io/content/2.15/tasks/upgrade.md b/linkerd.io/content/2.15/tasks/upgrade.md index 33610a19ed..a9b21ab8ac 100644 --- a/linkerd.io/content/2.15/tasks/upgrade.md +++ b/linkerd.io/content/2.15/tasks/upgrade.md @@ -295,8 +295,8 @@ This section contains release-specific information about upgrading. ### Upgrade notice: stable-2.15 and beyond -As of February 2024, the Linkerd project is no longer producing open source -stable release artifacts. The [Releases and Versions](/releases/) page +As of February 2024, the Linkerd project itself only produces [edge +release](/releases/) artifacts. The [Releases and Versions](/releases/) page contains more information about the different kinds of Linkerd releases. Known distributions of Linkerd with stable release artifacts include: