From 51ff35bef4c70a987e0c75c385c799115f4cc557 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 16:41:26 -0700 Subject: [PATCH 01/16] docs: install `consul-cni` via package --- website/content/docs/install/index.mdx | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 12ba6866e..cb5125877 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -230,6 +230,33 @@ net.bridge.bridge-nf-call-iptables = 1 +

Install `consul-cni` for Service Mesh

+ +If the `transparent_proxy` block is used for Consul Service Mesh, then the +`consul-cni` CNI Plugin must be installed to redirect outbound traffic to +the Envoy proxy. + + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo yum -y install consul-cni +``` + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo apt-get update && sudo apt-get install consul-cni +``` + + + + +

Verify cgroup controllers

On Linux, Nomad uses cgroups to control resource usage of tasks. If one or more From 331f96f103afd6734d37540ceb1f79d594e5d48c Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:06:39 -0700 Subject: [PATCH 02/16] Update index.mdx --- website/content/docs/install/index.mdx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index cb5125877..662822700 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -233,12 +233,15 @@ net.bridge.bridge-nf-call-iptables = 1

Install `consul-cni` for Service Mesh

If the `transparent_proxy` block is used for Consul Service Mesh, then the -`consul-cni` CNI Plugin must be installed to redirect outbound traffic to -the Envoy proxy. +`consul-cni` CNI Plugin must be installed on each client node to redirect inbound +and outbound traffic for services to the Envoy proxy. The following commands +assume that the linux packages repositories have already been added using `apt` or +`yum`. + Install the `consul-cni` plugin on each client node. ```shell-session From 92a5257d7b1475b68e70677c98b5470ad830c115 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:07:51 -0700 Subject: [PATCH 03/16] Update v1_8_x.mdx --- website/content/docs/release-notes/nomad/v1_8_x.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/release-notes/nomad/v1_8_x.mdx b/website/content/docs/release-notes/nomad/v1_8_x.mdx index ab0d0a19e..ede53948a 100644 --- a/website/content/docs/release-notes/nomad/v1_8_x.mdx +++ b/website/content/docs/release-notes/nomad/v1_8_x.mdx @@ -92,7 +92,7 @@ We are pleased to announce the following Nomad updates. Driver](/nomad/plugins/drivers/community/lxc) is now deprecated. Official support will be removed and the repo will be archived when Nomad 1.9 is released. Users are encouraged to migrate their workloads to another task - driver such as the built-in Docker task driver[/nomad/docs/drivers/docker]. + driver such as the built-in Docker task [driver](/nomad/docs/drivers/docker). - **ECS Task driver:** The remote [ECS Task Driver](https://developer.hashicorp.com/nomad/plugins/drivers/remote/ecs) is From 92af6280e35f9cc6311c5450afd652afa2784eb1 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:09:53 -0700 Subject: [PATCH 04/16] Update service-mesh.mdx --- website/content/docs/integrations/consul/service-mesh.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/integrations/consul/service-mesh.mdx b/website/content/docs/integrations/consul/service-mesh.mdx index be8dbed3a..a39f67518 100644 --- a/website/content/docs/integrations/consul/service-mesh.mdx +++ b/website/content/docs/integrations/consul/service-mesh.mdx @@ -188,7 +188,7 @@ Consul service mesh sidecar proxy. All Nomad client nodes using network namespac must have these CNI plugins [installed][cni_install]. To use [`transparent_proxy`][] mode, Nomad client nodes will also need the -[`consul-cni`][] plugin installed. +[`consul-cni`][] plugin installed. See the Linux post-installation [steps](/nomad/docs/install#post-installation-steps) for more detail on how to install CNI plugins. ## Run the Service Mesh-enabled Services From a08d6f576892a98052155743953bfe4c35168400 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:10:31 -0700 Subject: [PATCH 05/16] Update index.mdx --- website/content/docs/install/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 662822700..b6f102f71 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -236,7 +236,7 @@ If the `transparent_proxy` block is used for Consul Service Mesh, then the `consul-cni` CNI Plugin must be installed on each client node to redirect inbound and outbound traffic for services to the Envoy proxy. The following commands assume that the linux packages repositories have already been added using `apt` or -`yum`. +`yum` and that the reference CNI plugins have already been installed. From 5d9d3377271c502d669323d12d788c86f1bd45c1 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:37:21 -0700 Subject: [PATCH 06/16] Update index.mdx --- website/content/docs/install/index.mdx | 53 ++++++++++++++++---------- 1 file changed, 33 insertions(+), 20 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index b6f102f71..cf7c2ecb1 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -230,35 +230,19 @@ net.bridge.bridge-nf-call-iptables = 1 -

Install `consul-cni` for Service Mesh

+

Install `consul-cni` for Consul service mesh

If the `transparent_proxy` block is used for Consul Service Mesh, then the `consul-cni` CNI Plugin must be installed on each client node to redirect inbound and outbound traffic for services to the Envoy proxy. The following commands -assume that the linux packages repositories have already been added using `apt` or -`yum` and that the reference CNI plugins have already been installed. - - - - +assume that reference CNI plugins have already been installed. Install the `consul-cni` plugin on each client node. ```shell-session -$ sudo yum -y install consul-cni +$ curl -L -o consul-cni.tgz "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)"-v1.5.0.tgz && \ + sudo tar -C /opt/cni/bin -xzf consul-cni.tgz ``` - - - -Install the `consul-cni` plugin on each client node. - -```shell-session -$ sudo apt-get update && sudo apt-get install consul-cni -``` - - - -

Verify cgroup controllers

@@ -352,6 +336,35 @@ net.bridge.bridge-nf-call-iptables = 1 +

Install `consul-cni` for Consul service mesh

+ +If the `transparent_proxy` block is used for Consul Service Mesh, then the +`consul-cni` CNI Plugin must be installed on each client node to redirect inbound +and outbound traffic for services to the Envoy proxy. The following commands +assume that the linux packages repositories have already been added using `apt` or +`yum` and that the reference CNI plugins have already been installed. + + + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo yum -y install consul-cni +``` + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo apt-get update && sudo apt-get install consul-cni +``` + + + +

Verify cgroup controllers

On Linux, Nomad uses cgroups to control resource usage of tasks. If one or more From fe0e76cc3b503d439374d481ffa9a6bae103f5f4 Mon Sep 17 00:00:00 2001 From: David Yu Date: Thu, 13 Jun 2024 20:50:57 -0700 Subject: [PATCH 07/16] Update index.mdx --- website/content/docs/install/index.mdx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index cf7c2ecb1..0f630798e 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -237,11 +237,9 @@ If the `transparent_proxy` block is used for Consul Service Mesh, then the and outbound traffic for services to the Envoy proxy. The following commands assume that reference CNI plugins have already been installed. -Install the `consul-cni` plugin on each client node. - ```shell-session -$ curl -L -o consul-cni.tgz "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)"-v1.5.0.tgz && \ - sudo tar -C /opt/cni/bin -xzf consul-cni.tgz +$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)".zip && \ + unzip consul-cni.zip -d /opt/cni/bin ```

Verify cgroup controllers

From 947ecd1c7793793449512027ba792596f228105d Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 09:16:14 -0700 Subject: [PATCH 08/16] Update website/content/docs/install/index.mdx Co-authored-by: Tim Gross --- website/content/docs/install/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 0f630798e..75ff91c1e 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -357,7 +357,7 @@ $ sudo yum -y install consul-cni Install the `consul-cni` plugin on each client node. ```shell-session -$ sudo apt-get update && sudo apt-get install consul-cni +$ sudo apt-get install -y consul-cni ``` From 26a30ac908559c629137fffa018f179b096fb9d7 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 09:42:56 -0700 Subject: [PATCH 09/16] Update index.mdx --- website/content/docs/install/index.mdx | 89 +++++++++++++++----------- 1 file changed, 51 insertions(+), 38 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 75ff91c1e..ae6e2d0e2 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -206,6 +206,16 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` +If the `transparent_proxy` block is used for Consul Service Mesh, then the +`consul-cni` CNI Plugin must be installed on each client node to redirect inbound +and outbound traffic for services to the Envoy proxy. The following commands +assume that reference CNI plugins have already been installed. + +```shell-session +$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)".zip && \ + unzip consul-cni.zip -d /opt/cni/bin +``` + Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These tunables can be set as follows. @@ -230,18 +240,6 @@ net.bridge.bridge-nf-call-iptables = 1 -

Install `consul-cni` for Consul service mesh

- -If the `transparent_proxy` block is used for Consul Service Mesh, then the -`consul-cni` CNI Plugin must be installed on each client node to redirect inbound -and outbound traffic for services to the Envoy proxy. The following commands -assume that reference CNI plugins have already been installed. - -```shell-session -$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)".zip && \ - unzip consul-cni.zip -d /opt/cni/bin -``` -

Verify cgroup controllers

On Linux, Nomad uses cgroups to control resource usage of tasks. If one or more @@ -310,32 +308,6 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` -Ensure your Linux operating system distribution has been configured to allow -container traffic through the bridge network to be routed via iptables. These -tunables can be set as follows. - -```shell-session -$ echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-arptables && \ - echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-ip6tables && \ - echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-iptables -``` - -To preserve these settings on startup of a client node, add a file including the -following to `/etc/sysctl.d/` or remove the file your Linux distribution puts in -that directory. - - - -```ini -net.bridge.bridge-nf-call-arptables = 1 -net.bridge.bridge-nf-call-ip6tables = 1 -net.bridge.bridge-nf-call-iptables = 1 -``` - - - -

Install `consul-cni` for Consul service mesh

- If the `transparent_proxy` block is used for Consul Service Mesh, then the `consul-cni` CNI Plugin must be installed on each client node to redirect inbound and outbound traffic for services to the Envoy proxy. The following commands @@ -360,9 +332,50 @@ Install the `consul-cni` plugin on each client node. $ sudo apt-get install -y consul-cni ``` + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo dnf -y install consul-cni +``` + + + + +Install the `consul-cni` plugin on each client node. + +```shell-session +$ sudo yum -y install consul-cni +``` +Ensure your Linux operating system distribution has been configured to allow +container traffic through the bridge network to be routed via iptables. These +tunables can be set as follows. + +```shell-session +$ echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-arptables && \ + echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-ip6tables && \ + echo 1 | sudo tee /proc/sys/net/bridge/bridge-nf-call-iptables +``` + +To preserve these settings on startup of a client node, add a file including the +following to `/etc/sysctl.d/` or remove the file your Linux distribution puts in +that directory. + + + +```ini +net.bridge.bridge-nf-call-arptables = 1 +net.bridge.bridge-nf-call-ip6tables = 1 +net.bridge.bridge-nf-call-iptables = 1 +``` + + +

Verify cgroup controllers

On Linux, Nomad uses cgroups to control resource usage of tasks. If one or more From f9743812532285b43df6af6f2993e4c2bba8f27c Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 09:47:36 -0700 Subject: [PATCH 10/16] Update index.mdx --- website/content/docs/install/index.mdx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index ae6e2d0e2..d2392d64f 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -201,7 +201,8 @@ CNI plugins installed. The following commands install the CNI reference plugins. ```shell-session -$ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/releases/download/v1.5.0/cni-plugins-linux-$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)"-v1.5.0.tgz && \ +$ export ARCH_CNI=$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64) +$ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/releases/download/v1.5.0/cni-plugins-linux-${ARCH_CNI}"-v1.5.0.tgz && \ sudo mkdir -p /opt/cni/bin && \ sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` @@ -212,7 +213,8 @@ and outbound traffic for services to the Envoy proxy. The following commands assume that reference CNI plugins have already been installed. ```shell-session -$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64)".zip && \ +$ export ARCH_CNI=$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64) +$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_${ARCH_CNI}".zip && \ unzip consul-cni.zip -d /opt/cni/bin ``` From dea70a356e000186b06790cf23d1437070e85a41 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 10:03:17 -0700 Subject: [PATCH 11/16] Update index.mdx --- website/content/docs/install/index.mdx | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index d2392d64f..78dd9d09b 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -198,6 +198,8 @@ Nomad uses CNI plugins to configure network namespaces when using the `bridge` network mode. All Linux Nomad client nodes using network namespaces must have CNI plugins installed. +

Install reference CNI plugins

+ The following commands install the CNI reference plugins. ```shell-session @@ -207,6 +209,8 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` +

Install consul-cni CNI plugin

+ If the `transparent_proxy` block is used for Consul Service Mesh, then the `consul-cni` CNI Plugin must be installed on each client node to redirect inbound and outbound traffic for services to the Envoy proxy. The following commands @@ -218,6 +222,8 @@ $ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/con unzip consul-cni.zip -d /opt/cni/bin ``` +

Configure bridge network to route traffic through iptables/h4> + Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These tunables can be set as follows. @@ -302,6 +308,8 @@ Nomad uses CNI plugins to configure network namespaces when using the `bridge` network mode. All Linux Nomad client nodes using network namespaces must have CNI plugins installed. +

Install reference CNI plugins

+ The following commands install the CNI reference plugins. ```shell-session @@ -310,6 +318,8 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` +

Install consul-cni CNI plugin

+ If the `transparent_proxy` block is used for Consul Service Mesh, then the `consul-cni` CNI Plugin must be installed on each client node to redirect inbound and outbound traffic for services to the Envoy proxy. The following commands @@ -354,6 +364,8 @@ $ sudo yum -y install consul-cni +

Configure bridge network to route traffic through iptables/h4> + Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These tunables can be set as follows. From b79d813e7db7f3c8e105962ec8c6ed8b75d1575a Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 10:12:34 -0700 Subject: [PATCH 12/16] Update index.mdx --- website/content/docs/install/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 78dd9d09b..2a11e624c 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -222,7 +222,7 @@ $ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/con unzip consul-cni.zip -d /opt/cni/bin ``` -

Configure bridge network to route traffic through iptables/h4> +

Configure bridge network to route traffic through iptables

Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These @@ -364,7 +364,7 @@ $ sudo yum -y install consul-cni -

Configure bridge network to route traffic through iptables/h4> +

Configure bridge network to route traffic through iptables

Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These From ac2a5a851f68d9e19411f1b0f32a2e197d2a8560 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 10:25:52 -0700 Subject: [PATCH 13/16] Update index.mdx --- website/content/docs/install/index.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 2a11e624c..54006fd8a 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -218,8 +218,8 @@ assume that reference CNI plugins have already been installed. ```shell-session $ export ARCH_CNI=$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64) -$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni-1.5.0_linux_${ARCH_CNI}".zip && \ - unzip consul-cni.zip -d /opt/cni/bin +$ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni_1.5.0_linux_${ARCH_CNI}".zip && \ + sudo unzip consul-cni.zip -d /opt/cni/bin ```

Configure bridge network to route traffic through iptables

From be30e130fe9f573ed7fa5f3aa312a9ed8d24309f Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 10:57:05 -0700 Subject: [PATCH 14/16] Update index.mdx --- website/content/docs/install/index.mdx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 54006fd8a..72af8ad0e 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -209,6 +209,7 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` +

Install consul-cni CNI plugin

If the `transparent_proxy` block is used for Consul Service Mesh, then the @@ -222,7 +223,7 @@ $ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/con sudo unzip consul-cni.zip -d /opt/cni/bin ``` -

Configure bridge network to route traffic through iptables

+

Configure bridge network to route traffic through iptables

Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These @@ -318,6 +319,7 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` +

Install consul-cni CNI plugin

If the `transparent_proxy` block is used for Consul Service Mesh, then the @@ -364,7 +366,7 @@ $ sudo yum -y install consul-cni -

Configure bridge network to route traffic through iptables

+

Configure bridge network to route traffic through iptables

Ensure your Linux operating system distribution has been configured to allow container traffic through the bridge network to be routed via iptables. These From b2d29340b612bd8a6799c0e666413fc9c0feb567 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 11:00:49 -0700 Subject: [PATCH 15/16] Update index.mdx remove LICENSE.txt from unzip --- website/content/docs/install/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 72af8ad0e..52f83e1c8 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -220,7 +220,7 @@ assume that reference CNI plugins have already been installed. ```shell-session $ export ARCH_CNI=$( [ $(uname -m) = aarch64 ] && echo arm64 || echo amd64) $ curl -L -o consul-cni.zip "https://releases.hashicorp.com/consul-cni/1.5.0/consul-cni_1.5.0_linux_${ARCH_CNI}".zip && \ - sudo unzip consul-cni.zip -d /opt/cni/bin + sudo unzip consul-cni.zip -d /opt/cni/bin -x LICENSE.txt ```

Configure bridge network to route traffic through iptables

From 36f75c5f3ef1efa689cfef2a080f3bbf89a7bf69 Mon Sep 17 00:00:00 2001 From: David Yu Date: Fri, 14 Jun 2024 11:25:23 -0700 Subject: [PATCH 16/16] Update index.mdx --- website/content/docs/install/index.mdx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/website/content/docs/install/index.mdx b/website/content/docs/install/index.mdx index 52f83e1c8..8044ab877 100644 --- a/website/content/docs/install/index.mdx +++ b/website/content/docs/install/index.mdx @@ -208,8 +208,7 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo mkdir -p /opt/cni/bin && \ sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` - - +

Install consul-cni CNI plugin

If the `transparent_proxy` block is used for Consul Service Mesh, then the @@ -318,8 +317,7 @@ $ curl -L -o cni-plugins.tgz "https://github.com/containernetworking/plugins/rel sudo mkdir -p /opt/cni/bin && \ sudo tar -C /opt/cni/bin -xzf cni-plugins.tgz ``` - - +

Install consul-cni CNI plugin

If the `transparent_proxy` block is used for Consul Service Mesh, then the