Skip to content

Commit 5b85d89

Browse files
authored
Merge branch 'main' into standardize-block-code
2 parents 32490a5 + c8c2ca9 commit 5b85d89

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

linkerd.io/content/2-edge/features/gateway-api.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ against the compatibility table:
3636
| Linkerd versions | Gateway API version compatibility | HTTPRoute version | gRPC version |
3737
| ---------------- | --------------------------------- | ----------------- | ------------ |
3838
| 2.15 - 2.17 | 0.7 - 1.1.1 | v1beta1 | v1alpha2 |
39-
| 2.18 | 1.1.1 - 1.2.1 | v1 | v1 |
40-
| 2.19 | 1.1.1 - 1.4.0 | v1 | v1 |
39+
| 2.18 - 2.19 | 1.1.1 - 1.2.1 | v1 | v1 |
4140

4241
{{< note >}}
4342

@@ -64,7 +63,7 @@ by following the
6463
which is often as simple as:
6564

6665
```bash
67-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
66+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
6867
```
6968

7069
## Note: Precursors to Gateway API-based configuration

linkerd.io/content/2-edge/tasks/gateway-api-ownership-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ externally provided CRDs _before_ upgrading to Linkerd 2.18:
4242

4343
```bash
4444
kubectl apply -f \
45-
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
45+
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
4646
```
4747

4848
Next, run the usual upgrade command:
@@ -82,7 +82,7 @@ Next, overwrite Linkerd’s CRDs with the externally managed ones:
8282

8383
```bash
8484
kubectl apply -f \
85-
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
85+
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
8686
```
8787

8888
For all subsequent configuration updates or chart upgrades, use

linkerd.io/content/2.19/features/gateway-api.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ against the compatibility table:
3636
| Linkerd versions | Gateway API version compatibility | HTTPRoute version | gRPC version |
3737
| ---------------- | --------------------------------- | ----------------- | ------------ |
3838
| 2.15 - 2.17 | 0.7 - 1.1.1 | v1beta1 | v1alpha2 |
39-
| 2.18 | 1.1.1 - 1.2.1 | v1 | v1 |
40-
| 2.19 | 1.1.1 - 1.4.0 | v1 | v1 |
39+
| 2.18 - 2.19 | 1.1.1 - 1.2.1 | v1 | v1 |
4140

4241
{{< note >}}
4342

@@ -64,7 +63,7 @@ by following the
6463
which is often as simple as:
6564

6665
```bash
67-
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
66+
kubectl apply -f https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
6867
```
6968

7069
## Note: Precursors to Gateway API-based configuration

linkerd.io/content/2.19/tasks/gateway-api-ownership-migration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ externally provided CRDs _before_ upgrading to Linkerd 2.18:
4242

4343
```bash
4444
kubectl apply -f \
45-
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
45+
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
4646
```
4747

4848
Next, run the usual upgrade command:
@@ -82,7 +82,7 @@ Next, overwrite Linkerd’s CRDs with the externally managed ones:
8282

8383
```bash
8484
kubectl apply -f \
85-
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.4.0/standard-install.yaml
85+
https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.2.1/standard-install.yaml
8686
```
8787

8888
For all subsequent configuration updates or chart upgrades, use

0 commit comments

Comments
 (0)