From 0c167eb70785ceded41e2aa78da451e840fc6fa0 Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Thu, 17 Aug 2023 19:10:27 +0000 Subject: [PATCH 1/2] backport of commit a10c94df5629a3704959f961cf53785ea7232663 --- website/content/docs/connect/dataplane/index.mdx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/website/content/docs/connect/dataplane/index.mdx b/website/content/docs/connect/dataplane/index.mdx index 9b8f1a7e878..f7287e433f0 100644 --- a/website/content/docs/connect/dataplane/index.mdx +++ b/website/content/docs/connect/dataplane/index.mdx @@ -11,9 +11,9 @@ This topic provides an overview of Consul Dataplane, a lightweight process for m ## Supported environments -- Dataplanes can connect to Consul servers v1.14.0 and newer. -- Dataplanes on Kubernetes requires Consul K8s v1.0.0 and newer. -- Dataplanes on AWS Elastic Container Services (ECS) requires Consul ECS v0.7.0 and newer. +- Dataplanes can connect to Consul servers v1.14.0 and newer. +- Dataplanes on Kubernetes requires Consul K8s v1.0.0 and newer. +- Dataplanes on AWS Elastic Container Services (ECS) requires Consul ECS v0.7.0 and newer. ## What is Consul Dataplane? @@ -87,7 +87,7 @@ $ export VERSION=1.0.0 && \ Refer to the following documentation for Consul on ECS workloads: - [Deploy Consul with the Terraform module](/consul/docs/ecs/deploy/terraform) -- [Deploy Consul manually](/consul/ecs/install-manul) +- [Deploy Consul manually](/consul/ecs/install-manul) @@ -135,4 +135,4 @@ Consul Dataplane on ECS support the following features: ### Technical Constraints - Consul Dataplane is not supported on Windows. - +- Consul Dataplane requires the `NET_BIND_SERVICE` capability. From 66ae7131ee62bf73e8999425713f212b6cd29b8b Mon Sep 17 00:00:00 2001 From: Nathan Coleman Date: Mon, 21 Aug 2023 18:35:01 +0000 Subject: [PATCH 2/2] backport of commit 91ab4ec91d8ff54a50fe2b716d43a32af7659fef --- website/content/docs/connect/dataplane/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/connect/dataplane/index.mdx b/website/content/docs/connect/dataplane/index.mdx index f7287e433f0..f2eaa4eb789 100644 --- a/website/content/docs/connect/dataplane/index.mdx +++ b/website/content/docs/connect/dataplane/index.mdx @@ -135,4 +135,4 @@ Consul Dataplane on ECS support the following features: ### Technical Constraints - Consul Dataplane is not supported on Windows. -- Consul Dataplane requires the `NET_BIND_SERVICE` capability. +- Consul Dataplane requires the `NET_BIND_SERVICE` capability. Refer to [Set capabilities for a Container](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-capabilities-for-a-container) in the Kubernetes Documentation for more information.