Merge branch 'main' into alpeb/grafana-authpolicy

linkerd.io/content/2-edge/tasks/distributed-tracing.md

@@ -138,7 +138,8 @@ extension specifying the service exposing the Jaeger UI. By default, this would
 be something like this:
 
 ```bash
-linkerd viz install --set jaegerUrl=jaeger.linkerd-jaeger:16686
+linkerd viz install --set jaegerUrl=jaeger.linkerd-jaeger:16686 \
+  | kubectl apply -f -
 ```
 
 ## Cleanup
@@ -186,7 +187,8 @@ collector:
     exporters:
       jaeger:
         endpoint: my-jaeger-collector.my-jaeger-ns:14250
-        insecure: true
+        tls:
+          insecure: true
     service:
       extensions: [health_check]
       pipelines:

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

@@ -82,7 +82,7 @@ linkerd inject https://raw.githubusercontent.com/linkerd/linkerd2/main/test/inte
 ```
 
 This installs a simple client, and two server deployments.
-One of the server deployments i.e `faling-svc` always returns a 500 error,
+One of the server deployments i.e `failing-svc` always returns a 500 error,
 and the other one i.e `backend-svc` always returns a 200.
 
 ```bash

linkerd.io/content/2.10/tasks/linkerd-smi.md

@@ -82,7 +82,7 @@ linkerd inject https://raw.githubusercontent.com/linkerd/linkerd2/main/test/inte
 ```
 
 This installs a simple client, and two server deployments.
-One of the server deployments i.e `faling-svc` always returns a 500 error,
+One of the server deployments i.e `failing-svc` always returns a 500 error,
 and the other one i.e `backend-svc` always returns a 200.
 
 ```bash

linkerd.io/content/2.11/tasks/linkerd-smi.md

@@ -82,7 +82,7 @@ linkerd inject https://raw.githubusercontent.com/linkerd/linkerd2/main/test/inte
 ```
 
 This installs a simple client, and two server deployments.
-One of the server deployments i.e `faling-svc` always returns a 500 error,
+One of the server deployments i.e `failing-svc` always returns a 500 error,
 and the other one i.e `backend-svc` always returns a 200.
 
 ```bash

linkerd.io/content/2.12/tasks/linkerd-smi.md

@@ -82,7 +82,7 @@ linkerd inject https://raw.githubusercontent.com/linkerd/linkerd2/main/test/inte
 ```
 
 This installs a simple client, and two server deployments.
-One of the server deployments i.e `faling-svc` always returns a 500 error,
+One of the server deployments i.e `failing-svc` always returns a 500 error,
 and the other one i.e `backend-svc` always returns a 200.
 
 ```bash

linkerd.io/content/2.13/features/cni.md

@@ -9,10 +9,10 @@ every meshed pod to its proxy. (See the
 without the application being aware.
 
 By default, this rewiring is done with an [Init
-Container](../../reference/architecture/#linkerd-init-container) that uses iptables
-to install routing rules for the pod, at pod startup time. However, this requires
-the `CAP_NET_ADMIN` capability; and in some clusters, this capability is not
-granted to pods.
+Container](../../reference/architecture/#linkerd-init-container) that uses
+iptables to install routing rules for the pod, at pod startup time. However,
+this requires the `CAP_NET_ADMIN` capability; and in some clusters, this
+capability is not granted to pods.
 
 To handle this, Linkerd can optionally run these iptables rules in a [CNI
 plugin](https://kubernetes.io/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/)

linkerd.io/content/2.13/features/http-grpc.md

@@ -4,18 +4,18 @@ description = "Linkerd will automatically enable advanced features (including me
 weight = 1
 +++
 
-Linkerd can proxy all TCP connections, and will automatically enable advanced
-features (including metrics, load balancing, retries, and more) for HTTP,
-HTTP/2, and gRPC connections. (See
-[TCP Proxying and Protocol Detection](../protocol-detection/) for details of how
-this detection happens).
+Linkerd can proxy all TCP connections. For HTTP connections (including HTTP/1.0,
+HTTP/1.1, HTTP/2, and gRPC connections), it will automatically enable advanced
+L7 features including [request-level metrics](../telemetry/), [latency-aware
+load balancing](../load-balancing/), [retries](../retries-and-timeouts/), and
+more.
 
-## Notes
+(See [TCP Proxying and Protocol Detection](../protocol-detection/) for details of
+how this detection happens automatically, and how it can sometimes fail.)
 
-* gRPC applications that use [grpc-go][grpc-go] must use version 1.3 or later due
-  to a [bug](https://github.com/grpc/grpc-go/issues/1120) in earlier versions.
-* gRPC applications that use [@grpc/grpc-js][grpc-js] must use version 1.1.0 or later
-  due to a [bug](https://github.com/grpc/grpc-node/issues/1475) in earlier versions.
-
-[grpc-go]: https://github.com/grpc/grpc-go
-[grpc-js]: https://github.com/grpc/grpc-node/tree/master/packages/grpc-js
+Note that while Linkerd does [zero-config mutual TLS](../automatic-mtls/), it
+cannot decrypt TLS connections initiated by the outside world. For example, if
+you have a TLS connection from outside the cluster, or if your application does
+HTTP/2 plus TLS, Linkerd will treat these connections as raw TCP streams. To
+take advantage of Linkerd's full array of L7 features, communication between
+meshed pods must be TLS'd by Linkerd, not by the application itself.