From edf1ebed29b9922e1a3e8ac1a2738ae2c810dae4 Mon Sep 17 00:00:00 2001 From: Juanita Balaraj Date: Mon, 17 Jun 2024 19:42:34 +0000 Subject: [PATCH] This update is to address the comments in https://review.opendev.org/c/starlingx/docs/+/921082 Fixed formatting Change-Id: I79713a36e66db3a9f1fd63a16818c874ac046319 Signed-off-by: Juanita Balaraj --- .../manual-kubernetes-components-upgrade.rst | 21 ++++------- ...version-upgrade-in-aio-sx-13e05ba19840.rst | 36 +++++++++---------- 2 files changed, 23 insertions(+), 34 deletions(-) diff --git a/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst b/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst index c360bdd06..46b5204c0 100644 --- a/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst +++ b/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst @@ -9,7 +9,6 @@ Manual Kubernetes Version Upgrade You can upgrade the Kubernetes version on a running system from one supported version to another. - .. note:: Each |prod| release supports two or more consecutive Kubernetes releases. @@ -21,7 +20,6 @@ version to another. Kubernetes upgrades must be done sequentially without skipping any release(s). - .. rubric:: |context| To complete this task, you will apply the following three updates (patches) @@ -38,10 +36,8 @@ and upgrade various systems. This Kubernetes update upgrades kubelet and kubectl RPMs to the new Kubernetes version. - .. rubric:: |prereq| - .. _manual-kubernetes-components-upgrade-ul-jbr-vcn-ylb: - The system must be clear of alarms. @@ -163,7 +159,6 @@ and upgrade various systems. | state | upgrade-started | +--------------+--------------------------------------+ - The upgrade process checks the *applied*/*available* updates, the upgrade path, the health of the system, the installed applications compatibility and validates the system is ready for an upgrade. @@ -173,12 +168,6 @@ and upgrade various systems. upgrade process to ignore non-management-affecting alarms. Kubernetes cannot be upgraded if there are management-affecting alarms. -#. Update all applications that have the ``timing: pre`` metadata setting. - - .. code-block:: none - - ~(keystone_admin)]$ system kube-pre-application-update - #. Download the Kubernetes images. For example: @@ -213,6 +202,12 @@ and upgrade various systems. | updated_at | 2023-06-26T18:51:29.486448+00:00 | +--------------+--------------------------------------+ +#. Update all applications that have the ``timing: pre`` metadata setting. + + .. code-block:: none + + ~(keystone_admin)]$ system kube-pre-application-update + #. Upgrade Kubernetes networking. .. code-block:: none @@ -318,7 +313,6 @@ and upgrade various systems. For each controller, do the following. - #. For non |AIO-SX| systems, lock the controller. For example: @@ -358,7 +352,6 @@ and upgrade various systems. ~(keystone_admin)]$ system host-unlock controller-1 - #. Show the Kubernetes upgrade status. .. code-block:: none @@ -382,7 +375,6 @@ and upgrade various systems. For each worker host, do the following: - #. Lock the host. For example: @@ -418,7 +410,6 @@ and upgrade various systems. ~(keystone_admin)]$ system host-unlock worker-1 - #. Complete the Kubernetes upgrade. .. code-block:: none diff --git a/doc/source/updates/kubernetes/manual-kubernetes-multi-version-upgrade-in-aio-sx-13e05ba19840.rst b/doc/source/updates/kubernetes/manual-kubernetes-multi-version-upgrade-in-aio-sx-13e05ba19840.rst index 4354f0885..d0a894410 100644 --- a/doc/source/updates/kubernetes/manual-kubernetes-multi-version-upgrade-in-aio-sx-13e05ba19840.rst +++ b/doc/source/updates/kubernetes/manual-kubernetes-multi-version-upgrade-in-aio-sx-13e05ba19840.rst @@ -161,12 +161,6 @@ system. This feature is not supported in the system which is not |AIO-SX|. | updated_at | None | +--------------+--------------------------------------+ -#. Update all applications that have the ``timing: pre`` metadata setting. - - .. code-block:: none - - ~(keystone_admin)]$ system kube-pre-application-update - #. Confirm that the download has completed. .. code-block:: none @@ -183,6 +177,12 @@ system. This feature is not supported in the system which is not |AIO-SX|. | updated_at | 2023-08-24T02:38:16.374677+00:00 | +--------------+--------------------------------------+ +#. Update all applications that have the ``timing: pre`` metadata setting. + + .. code-block:: none + + ~(keystone_admin)]$ system kube-pre-application-update + #. Upgrade Kubernetes networking. .. code-block:: none @@ -343,19 +343,17 @@ system. This feature is not supported in the system which is not |AIO-SX|. | updated_at | 2023-08-24T11:56:56.178266+00:00 | +--------------+--------------------------------------+ - .. code-block:: none - - ~(keystone_admin)]$ system kube-upgrade-show - +--------------+--------------------------------------+ - | Property | Value | - +--------------+--------------------------------------+ - | uuid | 065e683a-13a3-4229-b3c7-701f90216a3d | - | from_version | v1.21.8 | - | to_version | v1.24.4 | - | state | uncordon-complete | - | created_at | 2023-08-24T11:56:56.178266+00:00 | - | updated_at | 2023-08-24T11:58:35.136866+00:00 | - +--------------+--------------------------------------+ + ~(keystone_admin)]$ system kube-upgrade-show + +--------------+--------------------------------------+ + | Property | Value | + +--------------+--------------------------------------+ + | uuid | 065e683a-13a3-4229-b3c7-701f90216a3d | + | from_version | v1.21.8 | + | to_version | v1.24.4 | + | state | uncordon-complete | + | created_at | 2023-08-24T11:56:56.178266+00:00 | + | updated_at | 2023-08-24T11:58:35.136866+00:00 | + +--------------+--------------------------------------+ The state **uncordon-complete** will be entered when the host uncordon has completed.