Improved install and upgrade guidance

Signed-off-by: Travis Beckham <[email protected]>
linkerd · Apr 3, 2024 · c8f965f · c8f965f
1 parent 6a52c6b
commit c8f965f
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 47 deletions.
diff --git a/linkerd.io/content/2.15/getting-started/_index.md b/linkerd.io/content/2.15/getting-started/_index.md
@@ -23,11 +23,7 @@ install the *CLI* (command-line interface) onto your local machine. Using this
 CLI, you'll then install the *control plane* onto your Kubernetes cluster.
 Finally, you'll "mesh" an application by adding Linkerd's *data plane* to it.
 
-{{< note >}}
-This page contains quick start instructions intended for non-production
-installations. For production-oriented configurations, we suggest reviewing
-resources in [Going to Production](/going-to-production/).
-{{< /note >}}
+{{< releases >}}
 
 ## Step 0: Setup
 

diff --git a/linkerd.io/content/2.15/reference/helm-chart-version-matrix.md b/linkerd.io/content/2.15/reference/helm-chart-version-matrix.md
@@ -0,0 +1,13 @@
++++
+title = "Helm Chart Version Matrix"
++++
+
+The following version matrices include only the latest versions of the stable
+releases along with corresponding app and Helm versions for Linkerd and
+extensions. Use these to guide you to the right Helm chart version or to
+automate workflows you might have.
+
+* [YAML matrix](/releases/release_matrix.yaml)
+* [JSON matrix](/releases/release_matrix.json)
+
+{{< release-data-table />}}
diff --git a/linkerd.io/content/2.15/tasks/install-helm.md b/linkerd.io/content/2.15/tasks/install-helm.md
@@ -6,7 +6,7 @@ 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.
 
-{{< trylpt >}}
+{{< releases >}}
 
 ## Prerequisite: generate identity certificates
 

diff --git a/linkerd.io/content/2.15/tasks/install.md b/linkerd.io/content/2.15/tasks/install.md
@@ -16,13 +16,13 @@ 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
 Helm which allows for repeatability.
 
-{{< trylpt >}}
-
 In either case, we recommend installing the CLI itself so that you can validate
 the success of the installation. See the [Getting Started
 Guide](../../getting-started/) for how to install the CLI if you haven't done
 this already.
 
+{{< releases >}}
+
 ## Requirements
 
 Linkerd requires a Kubernetes cluster on which to run. Where this cluster lives

diff --git a/linkerd.io/content/2.15/tasks/upgrade.md b/linkerd.io/content/2.15/tasks/upgrade.md
@@ -10,6 +10,12 @@ aliases = [
 In this guide, we'll walk you through how to perform zero-downtime upgrades for
 Linkerd.
 
+{{< note >}}
+This page contains instructions for the latest edge release of Linkerd. If
+you have installed a [stable distribution](/releases/#stable) of Linkerd, the
+vendor may have additional guidance on how to upgrade.
+{{< /note >}}
+
 Read through this guide carefully. Additionally, before starting a specific
 upgrade, please read through the version-specific upgrade notices below, which
 may contain important information about your version.

diff --git a/linkerd.io/content/releases/_index.md b/linkerd.io/content/releases/_index.md
@@ -1,5 +1,5 @@
 +++
-title = "Releases and Versions"
+title = "Releases"
 aliases = [ "edge" ]
 weight = 18
 +++
@@ -20,20 +20,6 @@ it also means they don't have stability guarantees. Upgrading between edge
 releases may involve breaking changes, and may involve partial features that are
 later modified or backed out.
 
-**Note:** Edge releases may introduce breaking changes.
-
-<!-- markdownlint-disable MD033 -->
-Edge releases follow a version numbering scheme of the form `<two digit
-year>.<month>.<number within the month>`. For example, `edge-24.1.2` is the
-second edge release of January 2024.
-<!-- markdownlint-enable MD033 -->
-
-To install the latest edge release via the CLI, you can run:
-
-```bash
-curl --proto '=https' --tlsv1.2 -sSfL https://run.linkerd.io/install-edge | sh
-```
-
 The full list of edge releases can be found on
 [GitHub](https://github.com/linkerd/linkerd2/releases).
 
@@ -48,15 +34,3 @@ Known stable distributions of Linkerd include:
 * [Buoyant Enterprise for
   Linkerd](https://docs.buoyant.io/buoyant-enterprise-linkerd) from Buoyant,
   creators of Linkerd.
-
-## Helm Chart Version Matrix
-
-The following version matrices include only the latest versions of the stable
-releases along with corresponding app and Helm versions for Linkerd and
-extensions. Use these to guide you to the right Helm chart version or to
-automate workflows you might have.
-
-* [YAML matrix](./release_matrix.yaml)
-* [JSON matrix](./release_matrix.json)
-
-{{< release-data-table />}}
diff --git a/linkerd.io/layouts/partials/admonition.html b/linkerd.io/layouts/partials/admonition.html
@@ -4,10 +4,11 @@
     {{end}}
     role="alert">
   <div class="message-body">
-    <p>
+    {{ if .title }}
+    <p class="mt-0">
       <i class="fa fa-{{ .icon }}"></i>&nbsp;<strong>{{ .title }}</strong>
     </p>
-
+    {{ end }}
     {{ .content | markdownify }}
   </div>
 </div>
diff --git a/linkerd.io/layouts/partials/sidebar-2.html b/linkerd.io/layouts/partials/sidebar-2.html
@@ -98,7 +98,7 @@
       </li>
       <li class="menu-list-item {{ if eq $currentPage.RelPermalink "/releases/" }}is-active{{ end }}">
         <a href="/releases/">
-          Releases and Versions
+          Releases
         </a>
       </li>
       <li class="menu-list-item {{ if eq $currentPage.RelPermalink "/design-principles/" }}is-active{{ end }}">

diff --git a/linkerd.io/layouts/shortcodes/release-data-table.html b/linkerd.io/layouts/shortcodes/release-data-table.html
@@ -5,24 +5,25 @@
 
   table{
   border-collapse:collapse;
-  border:1px solid #000000;
+  border:1px solid #DBDBDB;
   }
   th, td {
   padding: 5px;
   }
   table td{
-  border:1px solid #000000;
+  border:1px solid #DBDBDB;
 
   }
   table th{
-  border:1px solid #000000;
+  border:1px solid #DBDBDB;
   }
   </style>
 <table>
   <caption>Helm to App version matrix</caption>
   <thead>
     <tr>
        <th class="text-center">Release Name</th>
+       <th></th>
     </tr>
   </thead>
   <tbody>
@@ -40,17 +41,14 @@
             </thead>
             <tbody>
               {{ range $chart_name, $chart_data := $charts }}
-
                 <tr>
-                  <td> <a target="_blank" href="{{ $chart_data.chart_url }}">{{ $chart_name }}</a></td>
-                  <td> {{ $chart_data.chart_version }} </td>
-                  <td> {{ $release_version }} </td>
-
+                  <td><a target="_blank" href="{{ $chart_data.chart_url }}">{{ $chart_name }}</a></td>
+                  <td>{{ $chart_data.chart_version }}</td>
+                  <td>{{ $release_version }}</td>
                 </tr>
               {{ end }}
             </tbody>
           </table>
-
         </td>
       </tr>
     {{ end }}

diff --git a/linkerd.io/layouts/shortcodes/releases.html b/linkerd.io/layouts/shortcodes/releases.html
@@ -0,0 +1,2 @@
+{{ $content := "This page contains instructions using the latest edge release of Linkerd. To use a stable distribution, see [Linkerd Releases](/releases/)." | markdownify -}}
+{{ partial "admonition.html" (dict "type" "info" "icon" "info-circle" "id" (.Get "id") "title" "Linkerd Releases" "content" $content) }}