(DOCSP-30094) Reorder the section for upgrading OM version, fix versions (4.4 instead of 4.2, 6.0 instead of 5.0), make other related changes (#1355)

* (DOCSP-30094) Reorder the section for upgrading OM version

* Tech review feedback plus scope increase to address two more tickets

* Edits

* Edits

* Edits

* Edits

* Tech review for FCV

* Tech review for FCV

* Tech review

* Copy review. Ready to merge.

* One final nit. Adjusted line wrap

Author: JuliaMongo

source/includes/steps-upgrade-master.yaml

@@ -32,7 +32,8 @@ replacement:
        metadata:
         name: my-standalone-downgrade
        spec:
-        version: "4.2.2-ent"
+        version: "4.4.18-ent"
+        featureCompatibilityVersion: "4.2"
         type: Standalone
         project: my-project
         credentials: my-credentials

source/includes/steps-upgrade-mdb.yaml

@@ -5,7 +5,7 @@ inherit:
   file: steps-upgrade-master.yaml
   ref: upgrade-master-version
 replacement:
-  method: "Change the resource's |k8s-crd| as shown in the following example:"
+  method: "Change the settings in the :ref:`k8s-specification` as shown in the following example:"
 content: |
 
   {{mdb}}

source/om-resources.txt

@@ -10,46 +10,39 @@ Deploy and Configure Ops Manager Resources
   Review the |onprem| resource architecture.
 
 :ref:`plan-om-resource`
-  Review the |onprem| resource considerations and
-  prerequisites.
+  Review the |onprem| resource considerations and prerequisites.
 
 :ref:`deploy-om-container`
   Use the |k8s-op-short| to deploy an |onprem| instance and encrypt the
-  connection between the application database's replica set
-  members.
+  connection between the application database's replica set members.
 
 :ref:`deploy-om-container-remote-mode`
-  Use the |k8s-op-short| to configure |onprem| to operate in 
-  **Remote** mode. In Remote mode, the Backup Daemons and managed
-  MongoDB resources download installation archives from HTTP endpoints
-  on a web server or S3-compatible file store deployed to your |k8s|
-  cluster instead of from the Internet.
+  Use the |k8s-op-short| to configure |onprem| to operate in **Remote** mode.
+  In Remote mode, the Backup Daemons and managed MongoDB resources download
+  installation archives from HTTP endpoints on a web server or S3-compatible
+  file store deployed to your |k8s| cluster instead of from the Internet.
 
 :ref:`deploy-om-container-local-mode`
-  Use the |k8s-op-short| to configure |onprem| to operate in 
-  **Local** mode. In Local mode, the Backup Daemons and managed
-  MongoDB resources download installation archives from a |k8s-pv| that
-  you create for the |onprem| StatefulSet instead of from the Internet.
+  Use the |k8s-op-short| to configure |onprem| to operate in **Local** mode.
+  In Local mode, the Backup Daemons and managed MongoDB resources download
+  installation archives from a |k8s-pv| that you create for the |onprem|
+  StatefulSet instead of from the Internet.
 
-:ref:`secure-om-db-tls`
-  Encrypt the connection between the application database replica set
-  members.
+:ref:`meko-upgrade-om-version`
+  Upgrade the versions of your |onprem| instance and :term:`backing databases`
+  that the |k8s-op-short| uses to manage your deployment.
 
 :ref:`configure-om-queryable-backups`
-  Configure queryable backups for |onprem| deployments created with the
-  |k8s-op-short|.
+  Configure queryable backups for |onprem| deployments created with the |k8s-op-short|.
 
 :ref:`configure-file-store`
-  Configure backup snapshot storage for |onprem| resources
-  created with |k8s-op-short|.
+  Configure backup snapshot storage for |onprem| resources created with the |k8s-op-short|.
 
 :ref:`configure-kmip-backup-encryption`
   Configure |kmip| backup encryption.
 
 :ref:`cert-manager-integration`
-  Configure automated certificate renewal for |onprem| deployments with
-  ``cert-manager``.
-
+  Configure automated certificate renewal for |onprem| deployments with ``cert-manager``.
 
 .. class:: hidden
 
@@ -61,6 +54,7 @@ Deploy and Configure Ops Manager Resources
       /tutorial/deploy-om-container
       /tutorial/deploy-om-container-remote-mode
       /tutorial/deploy-om-container-local-mode
+      /tutorial/upgrade-om-version
       /tutorial/configure-om-queryable-backups
       /tutorial/configure-kmip-backup-encryption
       /tutorial/configure-file-store

source/reference/k8s/example-ops-manager.yaml

@@ -49,4 +49,4 @@ spec:
     name: om-db-user-secret
     key: password
    members: 3
-   version: "4.2.11-ent"
+   version: "4.4.18-ent"

source/tutorial/edit-deployment.txt

@@ -23,23 +23,21 @@ also modify :term:`standalone <standalone>` processes.
 Considerations
 --------------
 
-- You can't change individual members of a replica set or
-  sharded cluster. You can only change the whole set or cluster.
+- You can't change individual members of a replica set or sharded cluster.
+  You can change only the whole set or cluster.
 
-- If a setting isn't available for a MongoDB Kubernetes resource,
-  you can only make changes using the :opsmgr:`Ops Manager </>` or
-  :cloudmgr:`Cloud Manager </>` application.
+- If a setting isn't available for a MongoDB resource, you can make changes
+  using only the :opsmgr:`Ops Manager </>` or :cloudmgr:`Cloud Manager </>` application.
 
   - .. include:: /includes/admonitions/fact-unsupported-mongod-options.rst
 
-- There are certain settings you can only configure using the |k8s-op-short|. To
-  review the list of settings, see
-  :doc:`/reference/k8s-op-exclusive-settings`.
+- You can configure certain settings using only the |k8s-op-short|. To
+  review the list of settings, see :doc:`/reference/k8s-op-exclusive-settings`.
 
 Prerequisites
 -------------
 
-To update a MongoDB |k8s-obj|, you need to have completed the following procedures:
+Before you update a MongoDB |k8s-obj|, complete the following procedures:
 
 - :ref:`k8s-install-configure`
 - :ref:`create-k8s-credentials`
@@ -56,6 +54,5 @@ Procedure
    :hidden:
 
    /tutorial/upgrade-mdb-version
-   /tutorial/upgrade-om-version
    /tutorial/scale-resources
    /tutorial/resize-pv-storage

source/tutorial/upgrade-mdb-version.txt

@@ -12,9 +12,8 @@ Upgrade MongoDB Version and FCV
    :depth: 2
    :class: singlecol
 
-You can upgrade the major, minor, or feature compatibility versions
-of your MongoDB resource. These settings are configured in your
-resource's |k8s-crd|.
+You can upgrade the major, minor, or feature compatibility versions of
+your MongoDB resource. Configure these settings in your :ref:`k8s-specification`.
 
 Overview
 -------- 
@@ -32,16 +31,22 @@ version.
    If you update ``spec.version`` to a later version, consider setting
    :setting:`spec.featureCompatibilityVersion` to the current working
    MongoDB version to give yourself the option to downgrade if
-   necessary.
-
-   To learn more about feature compatibility, see
+   necessary. To learn more about feature compatibility, see
    :dbcommand:`setFeatureCompatibilityVersion` in the MongoDB Server
    Documentation.
 
 Procedure
 ---------
 
-To upgrade the standalone deployment's MongoDB version to 
-``4.2.2-ent``, complete the following steps:
+To upgrade the standalone deployment's MongoDB version from ``4.2.2-ent``
+to ``4.4.18-ent``, complete the steps in the following syntactic example.
+
+If you update ``spec.version`` to a later version without setting the
+:setting:`spec.featureCompatibilityVersion` to any value, the Feature
+Compatibility Version (FCV) upgrades to the **same version** that you specify
+in ``spec.version``. However, you can explicitly specify a previous
+version for the FCV. The following example illustrates this use case.
+It sets ``spec.version`` to ``4.4.18-ent`` and
+:setting:`spec.featureCompatibilityVersion` to ``4.2``.
 
 .. include:: /includes/steps/upgrade-mdb.rst

source/tutorial/upgrade-om-version.txt

@@ -12,7 +12,8 @@ Upgrade Ops Manager and Backing Database Versions
    :depth: 2 
    :class: singlecol
 
-Update the major and minor versions of your |onprem| instance and :term:`backing databases` in the :ref:`k8s-om-specification` that |k8s-op-short| uses to manage your deployment.
+Update the major and minor versions of your |onprem| instance and :term:`backing databases`
+in the :ref:`k8s-om-specification` that the |k8s-op-short| uses to manage your deployment.
 
 Prerequisites
 -------------
@@ -21,20 +22,26 @@ Prerequisites
 
    To maintain existing settings and availability, back up the following in your current |onprem| instance: 
 
-   - Your ``conf-mms.properties`` to a secure location. The ``conf-mms.properties`` stores settings for the |onprem| instance.
-   - Your ``gen.key`` files to a secure location.  The :ref:`gen.key <gen-key>` provides details to encrypt and decrypt |onprem|\s backing databases and user credentials. |onprem| might delete these files as part of the upgrade process.
-   - Your :ref:`application database <appdb-om-arch>`. If the upgrade fails, you need a current backup to restore your |onprem| instance.
+   - Your ``conf-mms.properties`` to a secure location. The ``conf-mms.properties``
+     stores settings for the |onprem| instance.
+   - Your ``gen.key`` files to a secure location. The :ref:`gen.key <gen-key>`
+     provides details to encrypt and decrypt |onprem|\'s backing databases
+     and user credentials. |onprem| might delete these files as part of the upgrade process.
+   - Your :ref:`application database <appdb-om-arch>`. If the upgrade fails,
+     you need a current backup to restore your |onprem| instance.
 
 1. Upgrade |onprem| by following the considerations, prerequisites, and procedure in :ref:`upgrade-om`.
 
-2. Reference :ref:`compatible-mdb-versions` to ensure your :term:`backing databases` use a MongoDB version that is compatible with the new |onprem| version.
+2. Reference :ref:`compatible-mdb-versions` to ensure your :term:`backing databases`
+   use a MongoDB version that is compatible with the new |onprem| version.
 
-3. If you need to upgrade your backing databases to a compatible MongoDB version, see :ref:`meko-upgrade-mdb-version`.
+3. If you need to upgrade your backing databases to a compatible MongoDB version,
+   see :ref:`meko-upgrade-mdb-version`.
 
 Procedure
 ---------
 
-To update |onprem| from 4.0 to 5.0 and the application database to MongoDB 
-``4.2.11-ent``, complete the following steps: 
+To update |onprem| from 5.0 to 6.0 and the application database to MongoDB 
+``4.4.18-ent``, complete the following steps: 
 
 .. include:: /includes/steps/upgrade-om.rst

source/upgrade.txt

@@ -22,6 +22,12 @@ Upgrade the |k8s-op-short| from Prior Versions
   Migrate your |k8s-op-short| deployments from Ubuntu-based container
   images to UBI-based container images.
 
+.. note::
+
+   To upgrade the versions of your |onprem| instance and :term:`backing databases`
+   that the |k8s-op-short| uses to manage your deployment, see :ref:`meko-upgrade-om-version`.
+   To upgrade the versions of your MongoDB resource, see :ref:`meko-upgrade-mdb-version`.
+
 .. class:: hidden
 
    .. toctree::