From b1f84c5ece31c5bd8f78b71775b2090fce4663f6 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Tue, 30 Oct 2018 14:53:01 -0400 Subject: [PATCH 1/4] =?UTF-8?q?Added=20details=20to=20=E2=80=9CInstall=20p?= =?UTF-8?q?od=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 | 31 ++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index ca53bc4f..6e73d3a7 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -203,13 +203,36 @@ communicate. Check whether or not your add-on requires special flags when you initialize the master control plane. For example, if you choose the `flannel` add-on, -then you must add :command:`--pod-network-cidr 10.244.0.0/16` to the `kubeadm -init` command. +then you must add the following to the `kubeadm init` command: -Similarly, if you choose the `weave` add-on, then you must change the CNI -add-on directory parameter because the weave plugin installs itself in the +.. code-block:: bash + + --pod-network-cidr 10.244.0.0/16 + +Similarly, if you choose the `weave` add-on, then you must make the following +changes because the weave plugin installs itself in the :file:`/opt/cni/bin` directory. +If you are using Docker and `weave`, 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`, edit the :file:`etc/crio/crio.conf` file +to change `plugin_dir` from: + +.. code-block:: bash + + plugin_dir = "/usr/libexec/cni/" + +to: + +.. code-block:: bash + + plugin_dir = "/opt/cni/bin" + Use your cluster **************** From 4e0c79ffae0a533fabee221af0cd2bf477701519 Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Wed, 31 Oct 2018 11:47:26 -0400 Subject: [PATCH 2/4] =?UTF-8?q?Edited=20details=20in=20=E2=80=9CInstall=20?= =?UTF-8?q?pod=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 | 35 +++++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 6e73d3a7..76e6529e 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -210,7 +210,7 @@ then you must add the following to the `kubeadm init` command: --pod-network-cidr 10.244.0.0/16 Similarly, if you choose the `weave` add-on, then you must make the following -changes because the weave plugin installs itself in the +changes because the weave-net plugin installs itself in the :file:`/opt/cni/bin` directory. If you are using Docker and `weave`, edit the :file:`kubeadm.conf` file to @@ -220,18 +220,33 @@ add: 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`, edit the :file:`etc/crio/crio.conf` file -to change `plugin_dir` from: +If you are using CRI-O and `weave`, you must complete the following steps. + +#. Edit the :file:`/etc/crio/crio.conf` file to change `plugin_dir` from: + + .. code-block:: bash + + plugin_dir = "/usr/libexec/cni/" + + to: + + .. code-block:: bash + + plugin_dir = "/opt/cni/bin" + +#. Add the `loopback` CNI plugin to the plugin path with the command: + + .. code-block:: bash + + sudo ln -s /usr/libexec/cni/loopback /opt/cni/bin/loopback + +If you are using CRI-O and `flannel` and you want to use Kata Containers, edit +the :file:`/etc/crio/crio.conf` file to add: .. code-block:: bash - plugin_dir = "/usr/libexec/cni/" - -to: - -.. code-block:: bash - - plugin_dir = "/opt/cni/bin" + [crio.runtime] + manage_network_ns_lifecycle = true Use your cluster From 1d04a16d61ccfac791e148d03773819186efa37a Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Nov 2018 10:34:53 -0400 Subject: [PATCH 3/4] =?UTF-8?q?Added=20more=20details=20in=20=E2=80=9CInst?= =?UTF-8?q?all=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 | 30 ++++++++++++--------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 76e6529e..999e1503 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -199,17 +199,29 @@ Install pod network add-on ************************** You must choose and install a `pod network add-on`_ to allow your pods to -communicate. +communicate. Check whether or not your add-on requires special flags when you +initialize the master control plane. -Check whether or not your add-on requires special flags when you initialize -the master control plane. For example, if you choose the `flannel` add-on, -then you must add the following to the `kubeadm init` command: +**Notes about flannel add-on** + +If you choose the `flannel` add-on, then you must add the following to the +`kubeadm init` command: .. code-block:: bash --pod-network-cidr 10.244.0.0/16 -Similarly, if you choose the `weave` add-on, then you must make the following +If you are using CRI-O and `flannel` and you want to use Kata Containers, edit +the :file:`/etc/crio/crio.conf` file to add: + +.. code-block:: bash + + [crio.runtime] + manage_network_ns_lifecycle = true + +**Notes about weave 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. @@ -240,14 +252,6 @@ If you are using CRI-O and `weave`, you must complete the following steps. sudo ln -s /usr/libexec/cni/loopback /opt/cni/bin/loopback -If you are using CRI-O and `flannel` and you want to use Kata Containers, edit -the :file:`/etc/crio/crio.conf` file to add: - -.. code-block:: bash - - [crio.runtime] - manage_network_ns_lifecycle = true - Use your cluster **************** From d2603e5aecd49d602a8e4dc17bf16a3abe4bf4ba Mon Sep 17 00:00:00 2001 From: MCamp859 Date: Thu, 1 Nov 2018 10:40:25 -0400 Subject: [PATCH 4/4] =?UTF-8?q?Edited=20more=20details=20in=20=E2=80=9CIns?= =?UTF-8?q?tall=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: