From 78b56df417a5a8d12613042bd4da1f2848c6b71f Mon Sep 17 00:00:00 2001 From: Michael Vincerra Date: Mon, 11 Feb 2019 12:09:57 -0800 Subject: [PATCH] Revises note in `Install Kubernetes and CRI runtimes." Signed-off-by: Michael Vincerra --- .../tutorials/kubernetes/kubernetes.rst | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/source/clear-linux/tutorials/kubernetes/kubernetes.rst b/source/clear-linux/tutorials/kubernetes/kubernetes.rst index 9b559529..c8c65a3a 100644 --- a/source/clear-linux/tutorials/kubernetes/kubernetes.rst +++ b/source/clear-linux/tutorials/kubernetes/kubernetes.rst @@ -1,12 +1,7 @@ .. _kubernetes: -<<<<<<< HEAD:source/clear-linux/tutorials/kubernetes.rst Run Kubernetes\* ################ -======= -Run Kubernetes -############## ->>>>>>> master:source/clear-linux/tutorials/kubernetes/kubernetes.rst This tutorial describes how to install, configure, and run the `Kubernetes container orchestration system`_ on |CL-ATTR| using CRI+O and @@ -48,17 +43,16 @@ Kubernetes, a set of supported :abbr:`CRI (Container Runtime Interface)` runtimes, and networking plugins, are included in the `cloud-native-basic`_ bundle. -.. note:: - - CRI-O’s default plugin_dir is :file:`/opt/cni/bin`. - CNI plugins are installed as part of ``cloud-native-basic``. - To install this framework, enter the following command: .. code-block:: bash sudo swupd bundle-add cloud-native-basic +.. note:: + + For more on networking plugins, see `Install pod network add-on`_. + Configure Kubernetes ********************