From 7d5c95c02230c812e9564bced2522206a3394919 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Wed, 23 Jan 2019 16:35:19 -0800 Subject: [PATCH 1/3] Corrects syntax error on lines 206-208. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/kubernetes.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 8da87fe0..645976cb 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -201,11 +201,11 @@ changes because it installs itself in the :file:`/opt/cni/bin` directory. For using CRI-O and ``Weave Net``, complete the following step. -#. Add the `loopback` CNI plugin to the plugin path with the command: +Add the `loopback` CNI plugin to the plugin path with the command: - code-block:: bash +.. code-block:: bash - sudo ln -s /usr/libexec/cni/loopback /opt/bin/cni/loopback + sudo ln -s /usr/libexec/cni/loopback /opt/bin/cni/loopback Use your cluster **************** From 33e64bb9b71f707e7aeeaf0394e3db51aafe87b1 Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Wed, 23 Jan 2019 16:37:21 -0800 Subject: [PATCH 2/3] Closes Issue #371. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/kubernetes.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 645976cb..0ae7ff7e 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -377,7 +377,6 @@ Troubleshooting /* Kubernetes with CRI-O + kata-runtime */ sudo -E kubeadm init --cri-socket=/run/crio/crio.sock - .. _Kubernetes container orchestration system: https://kubernetes.io/ .. _Kata Containers: https://katacontainers.io/ From 68c5d1fb0c88daa09f942aace43e9b2dd7976e9b Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Thu, 24 Jan 2019 11:59:59 -0800 Subject: [PATCH 3/3] Corrects formatting and grammatical errors. Signed-off-by: Michael Vincerra --- source/clear-linux/tutorials/kubernetes.rst | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes.rst b/source/clear-linux/tutorials/kubernetes.rst index 0ae7ff7e..f05d4109 100644 --- a/source/clear-linux/tutorials/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes.rst @@ -348,7 +348,9 @@ Troubleshooting export "SOCKS_PROXY=http://proxy.example.com:1080" export "NO_PROXY= site.com,.site.com,localhost,127.0.0.1, - can be obtained by running :command:`ifconfig`. + .. note:: + + can be obtained by running :command:`ifconfig`. #. Save and exit the `profile`. @@ -358,14 +360,13 @@ Troubleshooting sudo source profile - #. To assure your system isn't running previous session variables, run: + #. To ensure your system isn't running previous session variables, run: .. code-block:: bash sudo kubeadm reset --cri-socket=/run/crio/crio.sock - #. Continue below while pass `-E` in the command as shown. - + #. Continue below while passing `-E` in the command as shown. * Missing environment variables. @@ -374,8 +375,8 @@ Troubleshooting .. code-block:: bash - /* Kubernetes with CRI-O + kata-runtime */ - sudo -E kubeadm init --cri-socket=/run/crio/crio.sock + /* Kubernetes with CRI-O + kata-runtime */ + sudo -E kubeadm init --cri-socket=/run/crio/crio.sock .. _Kubernetes container orchestration system: https://kubernetes.io/