From d2603e5aecd49d602a8e4dc17bf16a3abe4bf4ba Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Nov 2018 10:40:25 -0400 Subject: [PATCH] =?UTF-8?q?Edited=20more=20details=20in=20=E2=80=9CInstall?= =?UTF-8?q?=20pod=20network=20add-on=E2=80=9D=20section.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MCamp859 --- source/clear-linux/tutorials/kubernetes.rst | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 999e1503..b5761750 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -219,20 +219,19 @@ the :file:`/etc/crio/crio.conf` file to add: [crio.runtime] manage_network_ns_lifecycle = true -**Notes about weave add-on** +**Notes about Weave Net add-on** -If you choose the `weave` add-on, then you must make the following -changes because the weave-net plugin installs itself in the -:file:`/opt/cni/bin` directory. +If you choose the `Weave Net` add-on, then you must make the following changes +because it installs itself in the :file:`/opt/cni/bin` directory. -If you are using Docker and `weave`, edit the :file:`kubeadm.conf` file to +If you are using Docker and `Weave Net`, edit the :file:`kubeadm.conf` file to add: .. code-block:: bash Environment="KUBELET_NETWORK_ARGS=--network-plugin=cni --cni-conf-dir=/etc/cni/net.d --cni-bin-dir=/opt/cni/bin" -If you are using CRI-O and `weave`, you must complete the following steps. +If you are using CRI-O and `Weave Net`, you must complete the following steps. #. Edit the :file:`/etc/crio/crio.conf` file to change `plugin_dir` from: