diff --git a/source/clear-linux/tutorials/kubernetes/kubernetes-bp.rst b/source/clear-linux/tutorials/kubernetes/kubernetes-bp.rst index 2afcd3ee..71216137 100644 --- a/source/clear-linux/tutorials/kubernetes/kubernetes-bp.rst +++ b/source/clear-linux/tutorials/kubernetes/kubernetes-bp.rst @@ -12,36 +12,32 @@ This tutorial shows you how to manage your Kubernetes cluster while using In our tutorial :ref:`kubernetes`, we explain how to set up a Kubernetes cluster on |CL| using `kubeadm`. `Kubeadm documentation`_ often builds on the assumption that the distribution uses a traditional package manager (e.g., -RPM/DEB). In contrast, |CL| manages packages in bundles. This document -describes best practices to manage cluster upgrades with kubeadm on a |CL|-based cluster. +RPM/DEB). + +In contrast, |CL| uses `swupd` to update the OS, which in this case updates +all of the kubernetes node and client binaries simultaneously, as part of +the `cloud-native-basic` bundle (e.g., kubectl, kubeadm, kubelet). Running +:command:`sudo swupd update` requires special care to ensure the OS +incorporates the latest Kubernetes upgrades. + +This document describes best practices to manage cluster upgrades with +`kubeadm` on a |CL|-based cluster. Prerequisites ************* Let's review some basic assumptions: -* |CL| includes Kubernetes support with the `cloud-native-basic` bundle. - -* Ensure `autoupdate` is enabled. See :ref:`swupd-guide`. - To enable, run: - - .. code-block:: bash - - sudo swupd autoupdate +* |CL| provides support for Kubernetes with the `cloud-native-basic` bundle. * Execute :command:`sudo swupd update` **on each node** to do the update. * Repeat the above command for both master and worker nodes. -Executing this command updates all of the kubernetes node and client -binaries simultaneously, which are part of `cloud-native-basic` bundle -(including kubectl, kubeadm, kubelet). - .. note:: Other Linux\* distros shown in Kubernetes upgrade documentation reflect - `apt-get update`, `apt-mark hold kubeadm`, and similar commands; however, such commands **aren not valid** on |CL|. - + `apt-get update`, `apt-mark hold kubeadm`, and similar commands; however, such commands **are not valid** on |CL|. Update the cluster ****************** @@ -53,24 +49,13 @@ Update the cluster sudo swupd update -#. Run this command to check the message-of-the-day, or `motd`: - - .. code-block:: bash - - cat /run/motd - -.. TODO: As of 01/29/19 the motd is only available if the k8s minor version changes. Under consideration that the motd will ALWAYS show when k8s changes. - -#. If the 'motd' indicates a change...., follow instructions below to update. - .. note:: - Do not restart the kubelet before the control plane is updated. + If the minor version of Kubernetes changes, |CL| shows a message-of-the-day, or `motd`. - If the `motd` appears, a kubelet restart on master and nodes - **must be postponed** until the control plane is properly updated. - :command:`swupd update` does not restart services automatically unless - explicitly configured to do so. + Please note: If the `motd` appears, you **must postpone** a kubelet restart on master and nodes until the control plane is properly updated. :command:`swupd update` does not restart services automatically unless explicitly configured to do so. + + Optional: If no `motd` appears, you may exit these instructions. #. Now follow these instructions in kubernetes documentation. @@ -78,7 +63,6 @@ Update the cluster * `Drain control plane node`_ * `Restart Kubelet and undrain node`_ - Update worker nodes ******************* @@ -94,6 +78,7 @@ Update worker nodes * `Update kubelet configuration`_ * `Restart Kubelet and undrain node`_ +.. _Kubeadm documentation: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-upgrade/ .. _Restart Kubelet and undrain node: https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-13/#restart-the-kubelet-for-all-nodes @@ -109,4 +94,5 @@ Update worker nodes .. _Kubeadmn documentation: https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm/ -.. _before you begin: https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-13/#before-you-begin \ No newline at end of file +.. _before you begin: https://kubernetes.io/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-1-13/#before-you-begin +