(DOCSP-11571): UBI 8 updates (#340)

jwilliams-mongo · web-flow · commit a0dc976646cd · 2020-08-11T11:03:03.000-04:00
* (DOCSP-11571): UBI 8 updates * (DOCSP-11571): few more UBI updates
diff --git a/source/includes/admonitions/ubi-8-min-db-versions.rst b/source/includes/admonitions/ubi-8-min-db-versions.rst
@@ -0,0 +1,7 @@
+.. important::
+
+   Ensure that you choose a :ref:`compatible MongoDB Server version
+   <k8s-mdb-version-compatibility>`.
+
+   Compatible versions differ depending on the base image that the
+   MongoDB database resource uses.
diff --git a/source/includes/list-tables/compatibility-k8s-os.rst b/source/includes/list-tables/compatibility-k8s-os.rst
@@ -34,4 +34,8 @@
      - 1.16, 1.17, 1.18, 1.19
      - 3.11, 4.2, 4.3, 4.4, 4.5
 
+   * - 1.7.0
+     - 1.16, 1.17, 1.18, 1.19
+     - 3.11, 4.2, 4.3, 4.4, 4.5
+
 .. [1] |k8s-op-short| v1.4.3 and later
diff --git a/source/includes/list-tables/compatibility-mdb.rst b/source/includes/list-tables/compatibility-mdb.rst
@@ -1,29 +1,47 @@
 .. list-table::
    :header-rows: 1
-   :widths: 50 50
+   :widths: 33 33 33
 
    * - |k8s-op-short| Release Series
+     - Base Image
      - MongoDB Version
    
    * - 1.0.0
+     - Any
      - 3.6, 4.0
    
    * - 1.1.0
+     - Any
      - 3.6, 4.0, 4.2
    
    * - 1.2.0
+     - Any
      - 3.6, 4.0, 4.2
 
    * - 1.3.0
+     - Any
      - 3.6, 4.0, 4.2
 
    * - 1.4.0
+     - Any
      - 3.6, 4.0, 4.2
 
    * - 1.5.0
+     - Any
      - 3.6, 4.0, 4.2
 
    * - 1.6.0
+     - Any
      - 4.0, 4.2, 4.4 [2]_
 
+   * - 1.7.0
+     - Ubuntu 16.04
+     - 4.0, 4.2, 4.4
+
+   * - 1.7.0
+     - Red Hat UBI 8 Base Image [3]_
+     - 4.0.15+, 4.2.1+, 4.4
+
 .. [2] |k8s-op-short| v1.6.1 and later
+
+.. [3] Most commonly used for OpenShift deployments
diff --git a/source/includes/list-tables/compatibility-om.rst b/source/includes/list-tables/compatibility-om.rst
@@ -25,3 +25,6 @@
 
    * - 1.6.0
      - 4.0, 4.2, 4.4
+
+   * - 1.7.0
+     - 4.0, 4.2, 4.4
diff --git a/source/includes/list-tables/rs-resource-base-options.rst b/source/includes/list-tables/rs-resource-base-options.rst
@@ -33,6 +33,8 @@
        The format should be ``X.Y.Z`` for the Community edition and
        ``X.Y.Z-ent`` for the Enterprise edition.
 
+       .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
        To learn more about MongoDB versioning, see
        :ref:`release-version-numbers` in the MongoDB Manual.
      - ``3.6.7``
diff --git a/source/includes/options-k8s-shared.yaml b/source/includes/options-k8s-shared.yaml
@@ -59,6 +59,8 @@ optional: false
 description: |
   Version of MongoDB that is installed on this |k8s-mdbrsc|.
 
+  .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
   .. note::
 
      If you update this value to a later version, consider setting
diff --git a/source/includes/steps-deploy-k8s-opsmgr-http.yaml b/source/includes/steps-deploy-k8s-opsmgr-http.yaml
@@ -126,6 +126,8 @@ content: |
           ``X.Y.Z-ent`` for the :product:`Enterprise edition
           </mongodb-enterprise-advanced>`.
 
+          .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
           .. include:: /includes/admonitions/note-deploy-om-offline.rst
 
           To learn more about MongoDB versioning, see see
diff --git a/source/includes/steps-deploy-k8s-opsmgr-https.yaml b/source/includes/steps-deploy-k8s-opsmgr-https.yaml
@@ -185,6 +185,8 @@ content: |
           ``X.Y.Z-ent`` for the :product:`Enterprise edition
           </mongodb-enterprise-advanced>`.
 
+          .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
           .. include:: /includes/admonitions/note-deploy-om-offline.rst
 
           To learn more about MongoDB versioning, see see
diff --git a/source/includes/steps-deploy-k8s-opsmgr-local-mode.yaml b/source/includes/steps-deploy-k8s-opsmgr-local-mode.yaml
@@ -129,21 +129,21 @@ content: |
      .. tab:: OpenShift
         :tabid: os
 
-        a. Download the RHEL 7 installation tarball for the MongoDB
+        a. Download the RHEL installation tarball for the MongoDB
            database version you want the |k8s-op-short| to deploy. For
            example, to download the ``4.4.0`` release:
 
            .. code-block:: sh
 
-              curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.4.0.tgz
+              curl -OL https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
 
         #. If you deployed |onprem| 4.4.0 and later, you must also
-           download the RHEL 7 MongoDB Database Tools installation
+           download the RHEL MongoDB Database Tools installation
            tarball. For example, to download the ``100.1.0`` release:
 
            .. code-block:: sh
 
-              curl -OL https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel70-x86_64-100.1.0.tgz
+              curl -OL https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel<version>-x86_64-100.1.0.tgz
 
 ---
 
@@ -221,15 +221,15 @@ content: |
 
            .. code-block:: sh
 
-              oc rsync  "ops-manager-localmode-0:/mongodb-ops-manager/mongodb-releases/mongodb-linux-x86_64-rhel70-4.4.0.tgz" \ 
-              mongodb-linux-x86_64-rhel70-4.4.0.tgz
+              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-rhel70-4.4.0.tgz" \ 
-              mongodb-linux-x86_64-rhel70-4.4.0.tgz
+              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 |onprem| 4.4.0 and later, copy the MongoDB
            Database Tools installation tarball to the |onprem|
@@ -247,8 +247,8 @@ content: |
 
            .. code-block:: sh
 
-              kubectl cp mongodb-database-tools-rhel70-x86_64-100.1.0.tgz \ 
-              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-rhel70-x86_64-100.1.0.tgz"
+              kubectl cp mongodb-database-tools-rhel<version>-x86_64-100.1.0.tgz \ 
+              "ops-manager-localmode-1:/mongodb-ops-manager/mongodb-releases/mongodb-database-tools-rhel<version>-x86_64-100.1.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
@@ -165,15 +165,15 @@ content: |
                   command:
                     - curl
                     - -L
-                    - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.2.0.tgz
+                    - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel<version>-4.2.0.tgz
                     - -o
-                    - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel70-4.2.0.tgz
+                    - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel<version>-4.2.0.tgz
                     - &&
                     - curl
                     - -L
-                    - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.4.0.tgz
+                    - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
                     - -o
-                    - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel70-4.4.0.tgz
+                    - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel<version>-4.4.0.tgz
 
         #. Save this file with a ``.yaml`` file extension.
 
diff --git a/source/includes/steps-deploy-k8s-sharded-cluster.yaml b/source/includes/steps-deploy-k8s-sharded-cluster.yaml
@@ -92,6 +92,8 @@ content: |
           The format should be ``X.Y.Z`` for the Community edition and
           ``X.Y.Z-ent`` for the Enterprise edition.
 
+          .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
           To learn more about MongoDB versioning, see
           :ref:`release-version-numbers` in the MongoDB Manual.
         - {+bndl-version-val+}
diff --git a/source/includes/steps-deploy-k8s-standalone.yaml b/source/includes/steps-deploy-k8s-standalone.yaml
@@ -64,6 +64,8 @@ content: |
           The format should be ``X.Y.Z`` for the Community edition and
           ``X.Y.Z-ent`` for the Enterprise edition.
 
+          .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
           To learn more about MongoDB versioning, see
           :ref:`release-version-numbers` in the MongoDB Manual.
         - {+bndl-version-val+}
diff --git a/source/reference/k8s-operator-om-specification.txt b/source/reference/k8s-operator-om-specification.txt
@@ -112,6 +112,8 @@ resources.
 
    This value defaults to {+bndl-version-val+}.
 
+   .. include:: /includes/admonitions/ubi-8-min-db-versions.rst
+
    .. include:: /includes/admonitions/note-deploy-om-offline.rst
 
    .. note::
diff --git a/source/reference/k8s/example-nginx-deployment-os.yaml b/source/reference/k8s/example-nginx-deployment-os.yaml
@@ -33,9 +33,9 @@ spec:
           command:
             - curl
             - -L
-            - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel70-4.2.0.tgz
+            - https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-rhel<version>-4.2.0.tgz
             - -o
-            - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel70-4.2.0.tgz
+            - /mongodb-ops-manager/mongodb-releases/linux/mongodb-linux-x86_64-rhel<version>-4.2.0.tgz
           volumeMounts:
             - name: mongodb-versions
               mountPath: /mongodb-ops-manager/mongodb-releases/linux
@@ -44,9 +44,9 @@ spec:
           command:
             - curl
             - -L
-            - https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel70-x86_64-100.1.0.tgz
+            - https://fastdl.mongodb.org/tools/db/mongodb-database-tools-rhel<version>-x86_64-100.1.0.tgz
             - -o
-            - /tools/db/mongodb-database-tools-rhel70-x86_64-100.1.0.tgz
+            - /tools/db/mongodb-database-tools-rhel<version>-x86_64-100.1.0.tgz
           volumeMounts:
             - name: mongodb-tools
               mountPath: /tools/db/
diff --git a/source/tutorial/plan-k8s-op-compatibility.txt b/source/tutorial/plan-k8s-op-compatibility.txt
@@ -25,6 +25,8 @@ Versions in *italics* are deprecated.
 
 .. include:: /includes/list-tables/compatibility-k8s-os.rst
 
+.. _k8s-mdb-version-compatibility:
+
 MongoDB Versions
 ----------------
 
diff --git a/source/tutorial/plan-k8s-op-considerations.txt b/source/tutorial/plan-k8s-op-considerations.txt
@@ -42,12 +42,15 @@ following operating systems:
    * - If you get your |k8s-op-short| from...
      - ...the Container uses
 
-   * - `quay.io <https://quay.io/repository/mongodb/mongodb-enterprise-operator?tag=latest&tab=tags>`__
+   * - `quay.io mongodb-enterprise-operator repository <https://quay.io/repository/mongodb/mongodb-enterprise-operator?tag=latest&tab=tags>`__
        or :gh:`GitHub </mongodb/mongodb-enterprise-kubernetes>`
      - `Ubuntu 16.04 <https://www.ubuntu.com/containers>`__
 
+   * - `quay.io mongodb-enterprise-operator-ubi repository <https://quay.io/repository/mongodb/mongodb-enterprise-operator-ubi?tag=latest&tab=tags>`__
+     - `Red Hat UBI 8 <https://www.redhat.com/en/topics/containers>`__
+
    * - `OpenShift <https://access.redhat.com/containers/?tab=tags#/registry.connect.redhat.com/mongodb/enterprise-operator>`__
-     - `Red Hat Enterprise Linux 7 <https://www.redhat.com/en/topics/containers>`__
+     - `Red Hat UBI 8 <https://www.redhat.com/en/topics/containers>`__
 
 MongoDB, Inc. updates all packages on these images before releasing
 them every three weeks.
