Merge "Trident upgrades"

doc/source/_vendor/vendor_strings.txt

@@ -66,7 +66,7 @@
 
 .. StarlingX (|prod|)
 
-.. |prod-ver|  replace:: 5.0.1
+.. |prod-ver|  replace:: 6.0
 
 .. StX OpenStack (|prod-os|)
 

doc/source/updates/kubernetes/configuring-kubernetes-update-orchestration.rst

@@ -74,6 +74,10 @@ For example:
 
 -   Hosts that need to be upgraded must be in the ``unlocked-enabled`` state.
 
+-   If you are using NetApp Trident, ensure that your NetApp version is
+    compatible with Trident 21.04 before upgrading Kubernetes to version 1.19
+    and after updating |prod| to version |prod-ver|.
+
 .. only:: partner
 
    .. include:: /_includes/configuring-kubernetes-update-orchestration.rest

doc/source/updates/kubernetes/manual-kubernetes-components-upgrade.rst

@@ -43,6 +43,10 @@ and upgrade various systems.
 -   All updates required for the new Kubernetes version must be transferred to
     the active controller.
 
+-   If you are using NetApp Trident, ensure that your NetApp version is
+    compatible with Trident 21.04 before upgrading Kubernetes to version 1.19
+    and after updating |prod| to version |prod-ver|.
+
 .. note::
     The default version on a fresh install will be Kubernetes 1.21.3, while
     on an upgrade from |prod| |prod-ver| it will be 1.18.1. You will need to
@@ -129,7 +133,7 @@ and upgrade various systems.
     validates the system is ready for an upgrade.
 
     .. warning::
-        The command :command:`system kube-upgrade-start --force` causes the 
+        The command :command:`system kube-upgrade-start --force` causes the
         upgrade process to ignore non-management-affecting alarms.
         Kubernetes cannot be upgraded if there are management-affecting alarms.