diff --git a/source/tutorials/kubernetes.rst b/source/tutorials/kubernetes.rst
index 2de64b2c..45c8858d 100644
--- a/source/tutorials/kubernetes.rst
+++ b/source/tutorials/kubernetes.rst
@@ -3,354 +3,761 @@
Kubernetes\*
############
-This tutorial describes how to install, configure, and start the
-`Kubernetes container orchestration system`_ on |CL-ATTR| using CRI+O and kata-runtime.
+This tutorial describes how to install, configure, and start the `Kubernetes
+container orchestration system`_ on |CL-ATTR|.
+
+A Kubernetes cluster can be setup on |CL| using the |CL| cloud-native-setup
+scripts to automate the process or can be setup through a manual step-by-step
+process. This tutorial covers both scenarios.
+
.. contents::
:local:
:depth: 1
-Description
+Background
***********
-Kubernetes is an open source system for automating deployment, scaling, and
-management of containerized applications. It groups containers that make up
-an application into logical units for easy management and discovery. Get up
-and running quickly with our `Cloud native setup automation`_.
+|CL| has builtin integrations to make setting up Kubernetes using a variety of
+`container runtimes
+`_.
-Kata Containers\* kata-runtime adheres to
-:abbr:`OCI (Open Container Initiative*)` guidelines and works seamlessly with
-Kubernetes. `Kata Containers`_ provides strong isolation for untrusted
-workloads or multi-tenant scenarios. Kata Containers can be
-allocated on a per-pod basis, so you can mix and match both on the same host
-to suit your needs.
+For more background information see:
+
+* `What is Kubernetes?`_
+* `What is a Container Network Interface (CNI)?`_
+
+* `What is a Container Runtime Interface (CRI)?`_
+
+ * `What is CRI+O?`_
+
+ * `What is containerd?`_
+
+ * `What is Docker?`_
+
+* `What is Kata Containers?`_
Prerequisites
*************
This tutorial assumes you have already installed |CL|. For detailed
-instructions on installing |CL| on a bare metal system, follow the
-:ref:`bare metal installation tutorial`.
-Learn about the benefits of having an up-to-date system for cloud
-orchestration on the :ref:`swupd-guide` page.
+instructions on installing |CL| on a bare metal system, follow the :ref:`bare
+metal installation tutorial`.
-Before you install any new packages, update |CL| with the following command:
+#. Review and make sure the `requirements for kubeadm
+ `_
+ are satisfied for the host system.
-.. code-block:: bash
+#. Before you continue, update your |CL| installation with the following
+ command:
- sudo swupd update
+ .. code-block:: bash
-Install Kubernetes and CRI runtimes
-***********************************
+ sudo swupd update
-Kubernetes, a set of supported :abbr:`CRI (Container Runtime Interface)`
-runtimes, and networking plugins, are included in the `cloud-native-basic`_
-bundle.
+ Learn about the benefits of having an up-to-date system for cloud
+ orchestration on the :ref:`swupd-guide` page.
-To install this framework, enter the following command:
+#. Kubernetes, a set of supported :abbr:`CRI (Container Runtime Interface)`
+ runtimes, :abbr:`CNI (Container Network Interface)` and `cloud-native-setup
+ scripts`_ are included in the `cloud-native-basic`_ bundle. Install the
+ cloud-native-basic bundle to get these components:
-.. code-block:: bash
+ .. code-block:: bash
- sudo swupd bundle-add cloud-native-basic
+ sudo swupd bundle-add cloud-native-basic
+
+
+Set up Kubernetes automatically
+*******************************
+
+|CL| provides `cloud-native-setup scripts`_ to automate system setup and
+Kubernetes cluster initialization which allows you to get a cluster up and
+running quickly.
.. note::
- For more on networking plugins, see `Install pod network add-on`_.
+ By default, the scripts will update |CL| to the latest version, set up the
+ system as a Kubernetes master-node with **canal for container networking**
+ and **crio for container runtime**, and taint the master node to allow
+ workloads to run on it. Kata is installed as an optional alternative
+ runtime. The script can be configured to use other CNI's and CRI's by
+ following the directions on the `README
+ `_.
+
+ See `What is a Container Network Interface (CNI)?`_ and `What is a
+ Container Runtime Interface (CRI)?`_ for more information.
-Configure Kubernetes
-********************
+.. important::
-This tutorial uses the basic default Kubernetes configuration for simplicity.
-You must define your Kubernetes configuration according to your specific
-deployment and your security needs.
+ If network proxy settings are required for Internet connectivity, configure
+ them now because the scripts will propagate proxy configuration based on
+ the running configuration. It is especially important to set the
+ :command:`no_proxy` variable appropriately for Kubernetes.
+
+ The script will also modify the :file:`/etc/environment` and
+ :file:`/etc/profile.d/proxy.sh` files, if they exist, with the proxy
+ environment variables in the running shell when the script is executed.
+
+ See the `Setting proxy servers for Kubernetes`_ section for details.
-#. Enable IP forwarding to avoid kubeadm `preflight check`_ errors:
-
- Create (or edit if it exists) the file :file:`/etc/sysctl.d/60-k8s.conf`
- and include the following line:
+#. Run the :file:`system-setup.sh` script to configure the |CL| system
+ settings.
.. code-block:: bash
- net.ipv4.ip_forward = 1
+ sudo /usr/share/clr-k8s-examples/setup_system.sh
- Apply the change:
+#. Stop docker and containerd to avoid conflicting CRIs being detected. The
+ scripts use CRIO for the CRI.
.. code-block:: bash
- sudo systemctl restart systemd-sysctl
+ sudo systemctl stop docker
+ sudo systemctl stop containerd
-#. Enable the kubelet service:
+#. Run the :file:`create_stack.sh` script to initialize the Kubernetes node
+ and setup a container network plugin.
+
+ .. code-block:: bash
+
+ sudo /usr/share/clr-k8s-examples/create_stack.sh minimal
+
+#. Follow the output on the screen and continue onto the section on `using
+ your cluster