Merge "This update is to address the comments in https://review.opendev.org/c/starlingx/docs/+/921082"

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

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
-
+       +--------------+--------------------------------------+
-        ~(keystone_admin)]$ system kube-upgrade-show
+       | Property     | Value                                |
-        +--------------+--------------------------------------+
+       +--------------+--------------------------------------+
-        | Property     | Value                                |
+       | uuid         | 065e683a-13a3-4229-b3c7-701f90216a3d |
-        +--------------+--------------------------------------+
+       | from_version | v1.21.8                              |
-        | uuid         | 065e683a-13a3-4229-b3c7-701f90216a3d |
+       | to_version   | v1.24.4                              |
-        | from_version | v1.21.8                              |
+       | state        | uncordon-complete                    |
-        | to_version   | v1.24.4                              |
+       | created_at   | 2023-08-24T11:56:56.178266+00:00     |
-        | state        | uncordon-complete                    |
+       | updated_at   | 2023-08-24T11:58:35.136866+00:00     |
-        | 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.