Skip to content

Commit 32490a5

Browse files
authored
Merge branch 'main' into standardize-block-code
2 parents d3f44f8 + f152ced commit 32490a5

File tree

21 files changed

+21
-21
lines changed

21 files changed

+21
-21
lines changed

.github/workflows/install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run: |
3434
make build-run.linkerd.io
3535
36-
- uses: actions/upload-artifact@v4.6.2
36+
- uses: actions/upload-artifact@v6.0.0
3737
with:
3838
name: run.linkerd.io
3939
path: tmp/run.linkerd.io/public

linkerd.io/content/2-edge/tasks/exposing-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ spec:
233233
- -linkerd-controller-api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
234234
- -linkerd-metrics-api-addr=metrics-api.linkerd-viz.svc.cluster.local:8085
235235
- -cluster-domain=cluster.local
236-
- -grafana-addr=grafana.linkerd-viz.svc.cluster.local:3000
236+
- -grafana-addr=grafana.grafana
237237
- -controller-namespace=linkerd
238238
- -viz-namespace=linkerd-viz
239239
- -log-level=info

linkerd.io/content/2-edge/tasks/grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ chart in the `grafana` namespace, you can install Linkerd Viz through the
9494
command line like so:
9595

9696
```bash
97-
linkerd viz install --set grafana.url=grafana.grafana:3000 \
97+
linkerd viz install --set grafana.url=grafana.grafana \
9898
| kubectl apply -f -
9999
```
100100

linkerd.io/content/2.11/tasks/exposing-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ spec:
232232
- -linkerd-controller-api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
233233
- -linkerd-metrics-api-addr=metrics-api.linkerd-viz.svc.cluster.local:8085
234234
- -cluster-domain=cluster.local
235-
- -grafana-addr=grafana.linkerd-viz.svc.cluster.local:3000
235+
- -grafana-addr=grafana.grafana
236236
- -controller-namespace=linkerd
237237
- -viz-namespace=linkerd-viz
238238
- -log-level=info

linkerd.io/content/2.11/tasks/grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ chart in the `grafana` namespace, you can install Linkerd Viz through the
8181
command line like so:
8282

8383
```bash
84-
linkerd viz install --set grafana.url=grafana.grafana:3000 \
84+
linkerd viz install --set grafana.url=grafana.grafana \
8585
| kubectl apply -f -
8686
```
8787

linkerd.io/content/2.12/tasks/exposing-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ spec:
233233
- -linkerd-controller-api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
234234
- -linkerd-metrics-api-addr=metrics-api.linkerd-viz.svc.cluster.local:8085
235235
- -cluster-domain=cluster.local
236-
- -grafana-addr=grafana.linkerd-viz.svc.cluster.local:3000
236+
- -grafana-addr=grafana.grafana
237237
- -controller-namespace=linkerd
238238
- -viz-namespace=linkerd-viz
239239
- -log-level=info

linkerd.io/content/2.12/tasks/grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ chart in the `grafana` namespace, you can install Linkerd Viz through the
8383
command line like so:
8484

8585
```bash
86-
linkerd viz install --set grafana.url=grafana.grafana:3000 \
86+
linkerd viz install --set grafana.url=grafana.grafana \
8787
| kubectl apply -f -
8888
```
8989

linkerd.io/content/2.13/tasks/exposing-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ spec:
233233
- -linkerd-controller-api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
234234
- -linkerd-metrics-api-addr=metrics-api.linkerd-viz.svc.cluster.local:8085
235235
- -cluster-domain=cluster.local
236-
- -grafana-addr=grafana.linkerd-viz.svc.cluster.local:3000
236+
- -grafana-addr=grafana.grafana
237237
- -controller-namespace=linkerd
238238
- -viz-namespace=linkerd-viz
239239
- -log-level=info

linkerd.io/content/2.13/tasks/grafana.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ chart in the `grafana` namespace, you can install Linkerd Viz through the
9494
command line like so:
9595

9696
```bash
97-
linkerd viz install --set grafana.url=grafana.grafana:3000 \
97+
linkerd viz install --set grafana.url=grafana.grafana \
9898
| kubectl apply -f -
9999
```
100100

linkerd.io/content/2.14/tasks/exposing-dashboard.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ spec:
233233
- -linkerd-controller-api-addr=linkerd-controller-api.linkerd.svc.cluster.local:8085
234234
- -linkerd-metrics-api-addr=metrics-api.linkerd-viz.svc.cluster.local:8085
235235
- -cluster-domain=cluster.local
236-
- -grafana-addr=grafana.linkerd-viz.svc.cluster.local:3000
236+
- -grafana-addr=grafana.grafana
237237
- -controller-namespace=linkerd
238238
- -viz-namespace=linkerd-viz
239239
- -log-level=info

0 commit comments

Comments
 (0)