Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linkerd.io/content/2.17/reference/k8s-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ chart below as these situations arise.
| `2.14` | `1.21` | `1.28` |
| `2.15` | `1.22` | `1.29` |
| `2.16` | `1.22` | `1.29` |
| `2.17` | `1.22` | `1.31` |
| `2.17` | `1.22` | `1.32` |
{{< /keyval >}}

Note that Linkerd will almost never change the supported Kubernetes version in
Expand Down
4 changes: 2 additions & 2 deletions linkerd.io/content/2.18/reference/k8s-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ chart below as these situations arise.
| `2.14` | `1.21` | `1.28` |
| `2.15` | `1.22` | `1.29` |
| `2.16` | `1.22` | `1.29` |
| `2.17` | `1.22` | `1.31` |
| `2.17` | `1.22` | `1.32` |
| `2.18` | `1.22` | `1.32` |
{{< /keyval >}}

Expand All @@ -41,6 +41,6 @@ later required Kubernetes 1.17 as shown in the table above.
|-----------------|----------------------------|----------------------------|
| `edge-22.10.1` - `edge-23.12.1` | `1.21` | `1.29` |
| `edge-23.12.2` - `edge-24.11.4` | `1.22` | `1.29` |
| `edge-24.11.5` - `edge-25.1.2` | `1.22` | `1.31` |
| `edge-24.11.5` - `edge-25.1.2` | `1.22` | `1.32` |
| `edge-25.2.1` and newer | `1.22` | `1.32` |
{{< /keyval >}}