diff --git a/doc/source/updates/kubernetes/configuring-kubernetes-update-orchestration.rst b/doc/source/updates/kubernetes/configuring-kubernetes-update-orchestration.rst index b7ff7c4e8..c078bd6b4 100644 --- a/doc/source/updates/kubernetes/configuring-kubernetes-update-orchestration.rst +++ b/doc/source/updates/kubernetes/configuring-kubernetes-update-orchestration.rst @@ -174,9 +174,10 @@ For example: upgrade concurrency is only supported for worker hosts. .. note:: - Kubernetes version upgrade is currently only supported for hosts with - worker function. Any attempt to modify the controller or storage - apply type is rejected. + + Setting the Kubernetes version upgrade apply type is only supported + for hosts with only the worker function. Any attempt to modify the + controller or storage apply type will be rejected. ``--worker-apply-type`` This option specifies the host concurrency of the Kubernetes version diff --git a/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst b/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst index 977643def..7e8f13076 100644 --- a/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst +++ b/doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst @@ -9,6 +9,19 @@ 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. + The default version on a fresh install will always be the latest Kubernetes + release supported by a |prod| release. Upgrades from previous releases will + always start with the same Kubernetes version as the highest version from + the release you are upgrading from. + + 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) @@ -50,12 +63,6 @@ and upgrade various systems. to upgrade the Trident drivers to 21.04 before upgrading Kubernetes to version 1.19. -.. note:: - The default version on a fresh install will be Kubernetes 1.21.8, while - on an upgrade from |prod| |prod-ver| it will be 1.18.1. You will need to - upgrade Kubernetes to each version up to 1.21.8 in order to be ready to - upgrade to the next version of |prod|. - .. rubric:: |proc| #. Upload, apply and install the platform update. @@ -112,9 +119,9 @@ and upgrade various systems. The version can be upgraded to. *unavailable* - The version is not available for upgrading. Either it is a downgrade - or it requires an intermediate upgrade first. Kubernetes can be only - upgraded one version at a time. + The version is not available for upgrading. Either it is a + downgrade or it requires an intermediate upgrade first. Kubernetes + can be only upgraded one version at a time. #. Confirm that the system is healthy.