Merge branch 'master' into newReference

kumahq · Jul 4, 2023 · d6e635f · d6e635f
2 parents a87cc0b + 57d52e9
commit d6e635f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/app/_src/policies/meshgatewayinstance.md b/app/_src/policies/meshgatewayinstance.md
@@ -31,6 +31,11 @@ This `Deployment` deploys 2 replicas of `kuma-dp` and corresponding builtin gate
 The control plane also creates a new `Service` to send network traffic to the builtin `Dataplane` pods.
 The `Service` is of type `LoadBalancer`, and its ports are automatically adjusted to match the listeners on the corresponding `MeshGateway`.
 
+{% tip %}
+If you're not using the `default` `Mesh`, you'll need to _label_ the
+`MeshGatewayInstance` using `kuma.io/mesh`.
+{% endtip %}
+
 ## Customization
 
 {% if_version lte:2.1.x %}

diff --git a/app/docs/dev/generated/kuma-cp.md b/app/docs/dev/generated/kuma-cp.md
@@ -703,4 +703,8 @@ proxy:
     # Sets the envoy runtime value to limit maximum number of incoming
     # connections to a builtin gateway data plane proxy
     globalDownstreamMaxConnections: 50000 # ENV: KUMA_PROXY_GATEWAY_GLOBAL_DOWNSTREAM_MAX_CONNECTIONS
+
+tracing:
+  openTelemetry:
+    endpoint: "" # e.g. otel-collector:4317
 ```
diff --git a/app/docs/dev/kuma-cp.yaml b/app/docs/dev/kuma-cp.yaml
@@ -697,3 +697,7 @@ proxy:
     # Sets the envoy runtime value to limit maximum number of incoming
     # connections to a builtin gateway data plane proxy
     globalDownstreamMaxConnections: 50000 # ENV: KUMA_PROXY_GATEWAY_GLOBAL_DOWNSTREAM_MAX_CONNECTIONS
+
+tracing:
+  openTelemetry:
+    endpoint: "" # e.g. otel-collector:4317