(DOCSP-47200) Transferred the same follow-up to the AKO docs as done for Atlas Docs (#203) (#206)

* (DOCSP-47200) Transferred the same followup to the AKO docs as done for Atlas docs

* edits

* Edits

* Edits

Author: JuliaMongo

source/atlasdeployment-custom-resource.txt

@@ -31,6 +31,7 @@ Migration to {+Flex-Clusters+}
    * Replace references to :setting:`spec.serverlessSpec` with configuration for
      :setting:`spec.flexSpec`.
 
+
 Breaking Changes with |ak8so| 2.0
 ----------------------------------
 
@@ -78,7 +79,7 @@ specify in the ``AtlasDeployment`` custom resource:
 .. note::
 
    Don't specify values for fields under :setting:`spec.serverlessSpec` because
-   {+Serverless-instances+} will be deprecated soon. Instead, specify fields under
+   {+Serverless-instances+} are deprecated. Instead, specify fields under
    :setting:`spec.flexSpec`. To learn more, see :ref:`ak8so-migration-to-flex`.
 
 Creating or updating a {+cluster+} or {+Flex-cluster+} can take
@@ -246,6 +247,11 @@ specification configured with some of the :oas-atlas-tag:`additional options
 {+Flex-Cluster+} Example
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. _ak8so-flex-notes:
+
+Notes on Transition To {+Flex-Clusters+}
+++++++++++++++++++++++++++++++++++++++++++
+
 .. include:: /includes/fact-ak8so-flex.rst
 
 The following example shows an ``AtlasDeployment`` custom resource
@@ -490,7 +496,7 @@ parameters available.
 - For a full list of available parameters for {+Flex-clusters+},
   see the |service| :oas-atlas-tag:`{+Flex-Clusters+} API </Flex-Clusters>`.
 
-.. include:: /includes/fact-ak8so-flex.rst
+See :ref:`ak8so-flex-notes` for full information on changes.
 
 To customize your specifications, refer to these descriptions, the available
 examples, and the |api| documentation.
@@ -562,7 +568,7 @@ examples, and the |api| documentation.
       You must specify :setting:`spec.deploymentSpec` or :setting:`spec.flexSpec`
       in your configuration.
 
-   .. include:: /includes/fact-ak8so-flex.rst
+   See :ref:`ak8so-flex-notes` for full information on changes.
 
 .. setting:: spec.deploymentSpec.clusterType
 
@@ -742,8 +748,8 @@ examples, and the |api| documentation.
           ``LTS``.
         - |service| deploys a {+cluster+} that runs MongoDB 7.0.
 
-      * - |service| will deprecate ``M2`` and ``M5`` {+clusters+} and
-          {+Serverless-instances+} in the near future. To learn more,
+      * - |service| deprecated ``M2`` and ``M5`` {+clusters+} and
+          {+Serverless-instances+}. To learn more,
           see :ref:`ak8so-migration-to-flex`.
           Set the :setting:`spec.deploymentSpec.replicationSpecs.regionConfigs.electableSpecs.instanceSize` 
           parameter to ``M0``, ``M2``, or ``M5``.
@@ -1480,7 +1486,7 @@ examples, and the |api| documentation.
 
    .. note::
 
-      .. include:: /includes/fact-ak8so-flex.rst
+      See :ref:`ak8so-flex-notes` for full information on changes.
 
    List that contains the {+Flex-cluster+} parameters from the 
    |api|. For a full list of available parameters, see the |service|
@@ -1701,7 +1707,7 @@ examples, and the |api| documentation.
 
    .. note::
 
-      .. include:: /includes/fact-ak8so-flex.rst
+      See :ref:`ak8so-flex-notes` for full information on changes.
 
    List that contains the {+Serverless-instance+} parameters from the 
    |api|. For a full list of available parameters, see the |service|
@@ -1736,7 +1742,7 @@ examples, and the |api| documentation.
 
    .. note::
 
-      .. include:: /includes/fact-ak8so-flex.rst
+      See :ref:`ak8so-flex-notes` for full information on changes.
 
    Configuration that specifies the settings for the provisioned hosts 
    on which MongoDB runs. The available options are specific to the 
@@ -1769,7 +1775,7 @@ examples, and the |api| documentation.
 
    .. note::
 
-      .. include:: /includes/fact-ak8so-flex.rst
+      See :ref:`ak8so-flex-notes` for full information on changes.
 
    Cloud service provider on which |service| provisions the host for a 
    {+Serverless-instance+}.
@@ -1795,7 +1801,7 @@ examples, and the |api| documentation.
 
    .. note::
 
-      .. include:: /includes/fact-ak8so-flex.rst
+      See :ref:`ak8so-flex-notes` for full information on changes.
 
    Physical location of your MongoDB {+Serverless-instance+}. The
    region you choose can affect network latency for clients accessing
@@ -1813,7 +1819,7 @@ examples, and the |api| documentation.
 .. setting:: spec.serverlessSpec.tags
 
   .. note::
-     .. include:: /includes/fact-ak8so-flex.rst
+     See :ref:`ak8so-flex-notes` for full information on changes.
 
    .. include:: /includes/fact-ak8so-tags.rst
 

source/includes/fact-ak8so-continuous-backup-private-endpoints-flex.rst

@@ -1,14 +1,10 @@
-|service| will deprecate ``M2`` and ``M5`` {+clusters+} and {+Serverless-instances+}
-in the near future. |service| will automatically migrate all ``M2`` and ``M5``
+|service| deprecated ``M2`` and ``M5`` {+clusters+} and {+Serverless-instances+}.
+In the near future, |service| will automatically migrate all ``M2`` and ``M5``
 {+clusters+} to {+Flex-clusters+}. For {+Serverless-instances+}, |service| will
 determine whether to migrate instances to {+Free-clusters+},
 {+Flex-clusters+}, or {+Dedicated-clusters+} according to your usage,
 then migrate your {+Serverless-instances+} automatically.
 
-The automatic migration of ``M2`` and ``M5`` {+clusters+} and {+Serverless-instances+}
-to {+Flex-clusters+} is seamless in |ak8so| without you having to make any
-migration changes, even though your CRD configurations might still contain parameters
-that are EOL. 
 
 To preserve backwards compatibility of the APIs for a period of time, |service|
 will continue to allow for these migrated {+clusters+} to be managed

source/includes/fact-ak8so-flex.rst

@@ -1,23 +1,63 @@
-{+Serverless-instances+} will be deprecated soon. |ak8so| supports {+Flex-clusters+}.
-Replace references to :setting:`spec.serverlessSpec` with configuration for
-:setting:`spec.flexSpec`. 
-
-The automatic migration of ``M2`` and ``M5`` {+clusters+} and {+Serverless-instances+}
-to {+Flex-clusters+} is seamless in |ak8so| without you having to make any
-migration changes, even though your CRD configurations might still contain parameters
-that are EOL. 
-
-To preserve backwards compatibility of the APIs for a period of time, |service|
-will continue to allow for these migrated {+clusters+} to be managed
-through the same APIs, including when using |ak8so|. The backwards
-compatibility of APIs will remain in place until January 2026, when the old
-APIs will be removed and only APIs related to {+Flex-clusters+} will remain in place.
-
-Support for private endpoints on {+Serverless-instances+} will end in March 2025. 
-You must update your {+ak8so+} configurations to remove private endpoints
-by March 2025. You must remove all remaining ``M2``, ``M5``, and 
-{+Serverless-instance+} features from your {+ak8so+} configurations before 
-January 2026.
+- Until January 2026, to preserve backwards compatibility for a period of time,
+  |service| allows you to manage migrated {+clusters+} through both
+  the {+Serverless-instances+} and {+Flex-clusters+} APIs, including when
+  you're using |ak8so|.
+
+- You can create and manage {+Flex-clusters+} in the same
+  :ref:`AtlasDeployment <atlasdeployment-custom-resource>` in which you
+  created and managed {+Serverless-instances+} and ``M2`` and ``M5`` {+clusters+}.
+
+- You can't create **NEW** ``M2``/``M5`` {+clusters+} and {+Serverless-instances+}
+  in |service|. Attempting to do so creates a {+Flex-cluster+} instead.
+
+- You can still use existing {+Serverless-instances+} in |ak8so| even though
+  existing {+Serverless-instances+} are deprecated as of early February 2025.
+
+- For your existing {+Serverless-instances+}, you can choose to replace
+  references to :setting:`spec.serverlessSpec` in the :ref:`AtlasDeployment <atlasdeployment-custom-resource>`
+  with the configuration for :setting:`spec.flexSpec`. Or, you can
+  continue using the same spec. Managing a deployment via the ``spec.serverlessSpec``
+  in the ``AtlasDeployment`` Custom Resource will continue to work even
+  once |service| automatically migrates these existing {+clusters+} to
+  {+Flex-clusters+} in March 2025.
+
+- For your existing ``M2`` and ``M5`` {+clusters+}, you can choose to replace
+  references to :setting:`spec.deploymentSpec` in the ``AtlasDeployment``
+  Custom Resource with the configuration for :setting:`spec.flexSpec`. Or, you can
+  continue using the same spec. Managing a deployment via the ``spec.deploymentSpec``
+  in the ``AtlasDeployment`` Custom Resource will continue to work even
+  once |service| automatically migrates these existing ``M2`` and ``M5`` {+clusters+}
+  to {+Flex-clusters+} in May 2025.
+
+- For your existing {+Serverless-instances+}, if you receive errors during
+  reconciliations related to private endpoints, you must upgrade to
+  {+ak8so+} 2.7.1, or replace the ``serverlessSpec`` configuration with
+  the configuration for ``flexSpec`` in the ``AtlasDeployment`` custom resource.
+
+- For your ``M2`` and ``M5`` {+clusters+}, to avoid reconciliation errors
+  that you might notice after the automigration, make the following changes
+  to your CRD configurations:
+
+  - Remove the :setting:`spec.deploymentSpec.replicationSpecs.zoneName` setting.
+
+  - Remove any of the :setting:`spec.deploymentSpec.replicationSpecs.regionConfigs`
+    settings after the first set of settings.
+
+  - Specify ``replicaset`` only in the :setting:`spec.deploymentSpec.clusterType`.
+
+  Alternatively, replace references to ``spec.deploymentSpec``
+  in the :ref:`AtlasDeployment <atlasdeployment-custom-resource>` with the configuration for
+  ``spec.flexSpec``.
+
+- By January 2026, you must remove all remaining ``M2``/``M5`` and 
+  {+Serverless-Instance+} configurations from your {+ak8so+} custom resources
+  because backwards compatibility of APIs ends January 2026, when the old
+  APIs will be removed and only APIs related to {+Flex-clusters+} will
+  remain in place.
+
+- Newer releases of {+ak8so+} will cease supporting existing
+  ``M2``/``M5`` {+clusters+} and {+Serverless-instances+}. Older versions of {+ak8so+}
+  will continue to support these instance types until January 2026.
 
 To learn more, see :ref:`ak8so-migration-to-flex`
 in this guide and the :atlas:`Flex Migration Guide </flex-migration>`

source/includes/fact-ak8so-migration-to-flex.rst

@@ -1,5 +1,5 @@
-|service| will deprecate ``M2`` and ``M5`` {+clusters+} and
-{+Serverless-instances+} in the near future. |service| will
+|service| deprecated ``M2`` and ``M5`` {+clusters+} and
+{+Serverless-instances+}. |service| will
 automatically migrate all ``M2`` and ``M5`` {+clusters+}
 to {+Flex-clusters+}. 
 For {+Serverless-instances+}, |service| will