Merge branch 'main' into flynn/august-edges

linkerd · Aug 6, 2024 · 92caea9 · 92caea9
2 parents 2cba70e + b941a35
commit 92caea9
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/linkerd.io/content/2.15/reference/k8s-versions.md b/linkerd.io/content/2.15/reference/k8s-versions.md
@@ -14,6 +14,8 @@ Kubernetes 1.28. In some cases, later versions of Kubernetes end up making
 changes that cause older versions of Linkerd to not work: we will update the
 chart below as these situations arise.
 
+## Stable Releases
+
 {{< table >}}
 | Linkerd Version | Minimum Kubernetes Version | Maximum Kubernetes Version |
 |-----------------|----------------------------|----------------------------|
@@ -22,10 +24,19 @@ chart below as these situations arise.
 | `2.12`          | `1.21`                     | `1.24`                     |
 | `2.13`          | `1.21`                     | `1.28`                     |
 | `2.14`          | `1.21`                     | `1.28`                     |
-| `2.15`          | `1.22`                     | `1.30`                     |
+| `2.15`          | `1.22`                     | `1.29`                     |
 {{< /table >}}
 
 Note that Linkerd will almost never change the supported Kubernetes version in
 a minor release, which is why the table above only lists major versions. One
 known exception: Linkerd 2.11.0 supported Kubernetes 1.16, but 2.11.1 and
 later required Kubernetes 1.17 as shown in the table above.
+
+## Edge Releases
+
+{{< table >}}
+| Linkerd Version | Minimum Kubernetes Version | Maximum Kubernetes Version |
+|-----------------|----------------------------|----------------------------|
+| `edge-22.10.1` - `edge-23.12.1` | `1.21`     | `1.29`                     |
+| `edge-23.12.2` and newer        | `1.22`     | `1.29`                     |
+{{< /table >}}