(DOCSP-24027) MEKO support for OM 6.0 (#1019)

JuliaMongo · web-flow · commit c78f676ff04a · 2022-09-22T13:44:00.000-04:00
* (DOCSP-24027) MEKO support for OM 6.0 * Copy review * Reverted changes to upgrade mdb version as not needed for this PR * Now ready for a tech review * Adjust Kubernetes API version to 1.25 per review, ready to merge * Some more feedback based on a related ticket from support * (DOCSP-24802) changes to remove OM 4.4 altogether and fully, as per change of plans * A few edits, ready for a copy review, finally, again
diff --git a/conf.py b/conf.py
@@ -59,14 +59,12 @@
 source_constants = {
     'version': version,
     'k8s-op-short': 'Kubernetes Operator',
-    'k8s-api-version': 'v1.21',
+    'k8s-api-version': 'v1.25',
     'aagent': 'MongoDB Agent or legacy Automation Agent',
     'aagents': 'MongoDB Agents or legacy Automation Agents',
     'mdbagent': 'MongoDB Agent',
-    'om-version': '5.0.0',
-    'om-version-val': '``5.0.0``',
-    'bndl-version': '4.2.2',
-    'bndl-version-val': '``4.2.11-ent``',
+    'om-version': '6.0.0',
+    'om-version-val': '``6.0.0``',
     'old-version': '4.0.14',
     'old-version-val': '``4.0.14-ent``',
     'old-version-example': '4.0.14-ent',
diff --git a/source/includes/admonitions/note-k8s-supported-in-om4.rst b/source/includes/admonitions/note-k8s-supported-in-om4.rst
@@ -1,7 +1,7 @@
 .. important:: 
    
    - You can use the |k8s-op-short| to deploy MongoDB resources with
-     |cloud-short| and with |onprem| version 4.4.x or later.
+     |cloud-short| and with |onprem| version 5.0.x or later.
      
    - You can use the :atlas:`Atlas Operator </reference/atlas-operator/ak8so-quick-start/>`
      to deploy MongoDB resources to |service|.
diff --git a/source/includes/code-examples/yaml-files/example-opsmgr.yaml b/source/includes/code-examples/yaml-files/example-opsmgr.yaml
@@ -6,7 +6,7 @@ metadata:
   name: om-appdb-tls-enabled
 spec:
   replicas: 1
-  version: "5.0.0"
+  version: "6.0.0"
   adminCredentials: ops-manager-admin-secret
   configuration:
     mms.fromEmailAddr: admin@example.com
diff --git a/source/includes/facts/fact-disable-tls.rst b/source/includes/facts/fact-disable-tls.rst
@@ -1,6 +1,6 @@
 |k8s-op-short| version :ref:`1.15.1 <ent_op-1.15.1>` fixes an issue 
 that prevented the |k8s-op-short| upgrade when managing a 
-TLS-enabled Application Datbase whose TLS certificate is stored in an 
+TLS-enabled Application Database whose TLS certificate is stored in an 
 :k8sdocs:`Opaque </concepts/configuration/secret/#opaque-secrets>` 
 secret.
 
diff --git a/source/includes/list-tables/compatibility-k8s-os.rst b/source/includes/list-tables/compatibility-k8s-os.rst
@@ -6,6 +6,10 @@
      - |k8s| Version
      - OpenShift Version
 
+   * - 1.17.x
+     - 1.21, 1.22, 1.23
+     - 4.9
+
    * - 1.16.x
      - 1.21, 1.22, 1.23
      - 4.9
@@ -18,34 +22,3 @@
      - 1.19, 1.20, 1.21, 1.22
      - 4.7, 4.8, 4.9
 
-   * - 1.13.x
-     - 1.19, 1.20, 1.21, 1.22
-     - 4.7, 4.8, 4.9
-
-   * - 1.12.x
-     - 1.19, 1.20, 1.21
-     - 4.6, 4.7
-
-   * - 1.11.x
-     - 1.19, 1.20, 1.21
-     - 4.6, 4.7
-
-   * - 1.10.x
-     - 1.19, 1.20, 1.21
-     - 4.6, 4.7
-
-   * - 1.9.x
-     - 1.18, 1.19, 1.20
-     - 4.3, 4.4, 4.5, 4.6
-
-   * - 1.8.x
-     - 1.18, 1.19, 1.20
-     - 4.3, 4.4, 4.5
-
-   * - 1.7.x
-     - 1.16, 1.17, 1.18, 1.19
-     - 3.11, 4.2, 4.3, 4.4, 4.5
-
-   * - 1.6.x
-     - 1.16, 1.17, 1.18, 1.19
-     - 3.11, 4.2, 4.3, 4.4, 4.5
diff --git a/source/includes/list-tables/compatibility-mdb.rst b/source/includes/list-tables/compatibility-mdb.rst
@@ -5,6 +5,9 @@
    * - |k8s-op-short| Release Series
      - Base Image
 
+   * - 1.17.x
+     - Ubuntu 20.04, Red Hat UBI 8 Base Image [1]_
+
    * - 1.16.x
      - Ubuntu 20.04, Red Hat UBI 8 Base Image [1]_
 
@@ -14,28 +17,5 @@
    * - 1.14.x
      - Ubuntu 20.04, Red Hat UBI 8 Base Image [1]_
 
-   * - 1.13.x
-     - Ubuntu 20.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.12.x
-     - Ubuntu 18.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.11.x
-     - Ubuntu 18.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.10.x
-     - Ubuntu 18.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.9.x
-     - Ubuntu 16.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.8.x
-     - Ubuntu 16.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.7.x
-     - Ubuntu 16.04, Red Hat UBI 8 Base Image [1]_
-
-   * - 1.6.x
-     - Ubuntu 16.04, Red Hat UBI 7 Base Image [1]_
 
 .. [1] Most commonly used for OpenShift deployments
diff --git a/source/includes/list-tables/compatibility-om.rst b/source/includes/list-tables/compatibility-om.rst
@@ -5,35 +5,14 @@
    * - |k8s-op-short| Release Series
      - |onprem| Version
 
-   * - 1.16.x
-     - 4.4, 5.0
+   * - 1.17.x
+     - 5.0, 6.0
+
+   * - 1.16.x 
+     - 5.0
 
    * - 1.15.x
-     - 4.4, 5.0
+     - 5.0
 
    * - 1.14.x
-     - 4.4, 5.0
-  
-   * - 1.13.x
-     - 4.4, 5.0
-
-   * - 1.12.x
-     - 4.4, 5.0
-
-   * - 1.11.x
-     - 4.2, 4.4
-
-   * - 1.10.x
-     - 4.2, 4.4
-
-   * - 1.9.x
-     - 4.2, 4.4
-
-   * - 1.8.x
-     - 4.2, 4.4
-
-   * - 1.7.x
-     - 4.2, 4.4
-
-   * - 1.6.x
-     - 4.0, 4.2, 4.4
+     - 5.0
diff --git a/source/includes/steps-configure-om-queryable-backups.yaml b/source/includes/steps-configure-om-queryable-backups.yaml
@@ -58,7 +58,7 @@ content: |
          name: ops-manager
        spec:
          replicas: 1
-         version: 5.0.0
+         version: 6.0.0
          adminCredentials: ops-manager-admin-secret
          backup:
            enabled: true
diff --git a/source/includes/steps-deploy-k8s-multi-cluster-rs-tls-custom.yaml b/source/includes/steps-deploy-k8s-multi-cluster-rs-tls-custom.yaml
@@ -31,7 +31,7 @@ content: |
       metadata:
        name: multi-replica-set
       spec:
-       version: 4.4.0-ent
+       version: 5.0.0-ent
        type: ReplicaSet
        persistent: false
        duplicateServiceObjects: true
diff --git a/source/includes/steps-deploy-k8s-multi-cluster-rs-x509-custom.yaml b/source/includes/steps-deploy-k8s-multi-cluster-rs-x509-custom.yaml
@@ -36,7 +36,7 @@ content: |
       metadata:
        name: multi-replica-set
       spec:
-       version: 4.4.0-ent
+       version: 5.0.0-ent
        type: ReplicaSet
        persistent: false
        duplicateServiceObjects: true
diff --git a/source/includes/steps-deploy-k8s-multi-cluster-x509-internal-custom.yaml b/source/includes/steps-deploy-k8s-multi-cluster-x509-internal-custom.yaml
@@ -42,7 +42,7 @@ content: |
       metadata:
        name: multi-replica-set
       spec:
-       version: 4.4.0-ent
+       version: 5.0.0-ent
        type: ReplicaSet
        persistent: false
        duplicateServiceObjects: true
diff --git a/source/includes/steps-deploy-k8s-opsmgr-local-mode.yaml b/source/includes/steps-deploy-k8s-opsmgr-local-mode.yaml
@@ -79,7 +79,7 @@ content: |
       name: ops-manager-localmode
      spec:
       replicas: 2
-      version: "5.0.0"
+      version: "6.0.0"
       adminCredentials: ops-manager-admin-secret
       configuration:
         # this enables local mode in Ops Manager
@@ -241,7 +241,6 @@ content: |
      :language: yaml
      :copyable: false
      :linenos:
-     :emphasize-lines: 12,14
 
   Copy the value of the ``status.opsManager.url`` field, which states 
   the resource's connection |url|. You use this value when you create a
@@ -278,14 +277,6 @@ content: |
 
               curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-4.4.0.tgz
 
-        #. If you deployed a version of |onprem| from 4.4.0 up to and
-           including 4.4.3, you must also
-           download the Ubuntu 20.04 MongoDB Database Tools installation
-           tarball. For example, to download the ``{+mdbtools-version+}`` release:
-
-           .. code-block:: sh
-
-              curl -OL https://fastdl.mongodb.org/tools/db/mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz
 
      .. tab:: OpenShift
         :tabid: os
@@ -298,14 +289,6 @@ content: |
 
               curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
 
-        #. If you deployed a version of |onprem| from 4.4.0 up to and
-           including 4.4.3, you must also
-           download the RHEL MongoDB Database Tools installation
-           tarball. For example, to download the ``{+mdbtools-version+}`` release:
-
-           .. code-block:: sh
-
-              curl -OL https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel<version>-x86_64-{+mdbtools-version+}.tgz
 
 ---
 
@@ -337,42 +320,24 @@ content: |
         |onprem| PersistentVolume:
 
         a. Copy the MongoDB Server installation tarball to the
-           |onprem| PersistentVolume. For example, to copy the ``4.4.0``
+           |onprem| PersistentVolume. For example, to copy the ``5.0.0``
            release:
 
            | Replica 0:
 
            .. code-block:: sh
 
-              kubectl cp mongodb-linux-x86_64-ubuntu1604-4.4.0.tgz \ 
-              "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-ubuntu1604-4.4.0.tgz"
+              kubectl cp mongodb-linux-x86_64-ubuntu1604-5.0.0.tgz \ 
+              "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-ubuntu1604-5.0.0.tgz"
 
            | Replica 1:
 
            .. code-block:: sh
 
-              kubectl cp mongodb-linux-x86_64-ubuntu1604-4.4.0.tgz \ 
-              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-ubuntu1604-4.4.0.tgz"
-
-        #. If you deployed a version of |onprem| from 4.4.0 up to and
-           including 4.4.3, copy the MongoDB   
-           Database Tools installation ``tarball`` to the |onprem|
-           PersistentVolume. For example, to copy the
-           ``{+mdbtools-version+}`` release:
-
-           | Replica 0:
-
-           .. code-block:: sh
-
-              kubectl cp mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz \ 
-              "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz"
-
-           | Replica 1:
+              kubectl cp mongodb-linux-x86_64-ubuntu1604-5.0.0.tgz \ 
+              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-ubuntu1604-5.0.0.tgz"
 
-           .. code-block:: sh
 
-              kubectl cp mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz \ 
-              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz"
 
      .. tab:: OpenShift
         :tabid: os
@@ -381,42 +346,22 @@ content: |
         |onprem| PersistentVolume:
 
         a. Copy the MongoDB Server installation ``tarball`` to the 
-           |onprem| PersistentVolume. For example, to copy the ``4.4.0``
+           |onprem| PersistentVolume. For example, to copy the ``5.0.0``
            release:
 
            | Replica 0:
 
            .. code-block:: sh
 
-              oc rsync  "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz" \ 
-              mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
-
-           | Replica 1:
-
-           .. code-block:: sh
-
-              oc rsync  "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz" \ 
-              mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
-
-        #. If you deployed a version of |onprem| from 4.4.0 up to and
-           including 4.4.3, copy the MongoDB 
-           Database Tools installation ``tarball`` to the |onprem|
-           PersistentVolume. For example, to copy the
-           ``{+mdbtools-version+}`` release:
-
-           | Replica 0:
-
-           .. code-block:: sh
-
-              kubectl cp mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz \ 
-              "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-ubuntu1604-x86_64-{+mdbtools-version+}.tgz"
+              oc rsync  "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-rhel<version>-5.0.0.tgz" \ 
+              mongodb-linux-x86_64-rhel<version>-5.0.0.tgz
 
            | Replica 1:
 
            .. code-block:: sh
 
-              kubectl cp mongodb-database-tools-rhel<version>-x86_64-{+mdbtools-version+}.tgz \ 
-              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-rhel<version>-x86_64-{+mdbtools-version+}.tgz"
+              oc rsync  "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-rhel<version>-5.0.0.tgz" \ 
+              mongodb-linux-x86_64-rhel<version>-5.0.0.tgz
 
 ---
 title: "Deploy a MongoDB Database Resource."
diff --git a/source/includes/steps-deploy-k8s-opsmgr-remote-mode.yaml b/source/includes/steps-deploy-k8s-opsmgr-remote-mode.yaml
@@ -238,11 +238,6 @@ content: |
     "false"`` in :opsmgrkube:`spec.configuration` to help ensure 
     enterprise builds have no issues.
 
-    .. important::
-
-       You must set this parameter only if you use a version of 
-       |onprem| before 4.4.11.
-
   .. literalinclude:: /reference/k8s/example-opsmgr-remote-mode.yaml
      :language: yaml
      :linenos:
diff --git a/source/includes/steps-migrate-specified-to-new-appdb-v.yaml b/source/includes/steps-migrate-specified-to-new-appdb-v.yaml
@@ -25,13 +25,13 @@ content: |
        metadata:
         name: ops-manager
      spec:
-      version: 4.4.0
+      version: 5.0.0
       replicas: 3
       adminCredentials: ops-manager-admin-secret
       backup:
         enabled: false
       applicationDatabase:
-        version: 4.4.4-ent
+        version: 5.0.0-ent
          members: 3
 
 ---
diff --git a/source/reference/k8s/example-opsmgr-remote-mode.yaml b/source/reference/k8s/example-opsmgr-remote-mode.yaml
@@ -5,14 +5,12 @@ metadata:
  name: ops-manager-localmode
 spec:
  replicas: 1
- version: "4.4.0-rc1"
+ version: "6.0.0"
  adminCredentials: ops-manager-admin-secret
  configuration:
    # this enables local mode in Ops Manager
    automation.versions.source: remote
-   automation.versions.download.baseUrl: "http://nginx-svc.<namespace>.svc.cluster.local:80"
-   # set the following only if you use a version before Ops Manager 4.4.11
-   automation.versions.download.baseUrl.allowOnlyAvailableBuilds: "false"
+   automation.versions.download.baseUrl: "http://nginx-svc.<namespace>.svc.cluster.local:8080"
 
  backup:
    enabled: false
diff --git a/source/reference/troubleshooting.txt b/source/reference/troubleshooting.txt
diff --git a/source/tutorial/deploy-om-container-local-mode.txt b/source/tutorial/deploy-om-container-local-mode.txt
diff --git a/source/tutorial/plan-k8s-op-compatibility.txt b/source/tutorial/plan-k8s-op-compatibility.txt
diff --git a/source/tutorial/scale-resources.txt b/source/tutorial/scale-resources.txt
diff --git a/source/tutorial/upgrade-mdb-version.txt b/source/tutorial/upgrade-mdb-version.txt
