From 7ed0b81e3fa27858fe512a1775dcfc9593f5a225 Mon Sep 17 00:00:00 2001 From: Ben Leggett <854255+bleggett@users.noreply.github.com> Date: Thu, 2 May 2024 15:08:41 -0400 Subject: [PATCH] Sync doc with https://github.com/istio/istio/pull/50804 (#15017) Signed-off-by: Benjamin Leggett --- content/en/docs/ambient/usage/ztunnel/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/en/docs/ambient/usage/ztunnel/index.md b/content/en/docs/ambient/usage/ztunnel/index.md index ad36cca631..2fbc0fb30b 100644 --- a/content/en/docs/ambient/usage/ztunnel/index.md +++ b/content/en/docs/ambient/usage/ztunnel/index.md @@ -336,9 +336,9 @@ The exact logic to determine whether a pod is set up to use ambient mode is as f 1. The `istio-cni` plugin configuration exclude list configured in `cni.values.excludeNamespaces` is used to skip namespaces in the exclude list. 1. `ambient` mode is used for a pod if - * The namespace has label `istio.io/dataplane-mode=ambient` + * The namespace or pod has the label `istio.io/dataplane-mode=ambient` + * The pod does not have the opt-out label `istio.io/dataplane-mode=none` * The annotation `sidecar.istio.io/status` is not present on the pod - * `ambient.istio.io/redirection` is not `disabled` The simplest option to avoid a configuration conflict is for a user to ensure that for each namespace, it either has the label for sidecar injection (`istio-injection=enabled`) or for ambient data plane mode (`istio.io/dataplane-mode=ambient`) but never both.