(DOCSP-30878): Align versions for MEKO dependent images (#1562)

davidhou17 · web-flow · commit 19467f03c7ba · 2024-01-10T15:13:56.000-06:00
* align versions for dependant images

* update version no.

* remove references to quay.io/mongodb/mongodb-enterprise-appdb image

* remove unused source constants

* add links to release notes

* copy feedback
diff --git a/snooty.toml b/snooty.toml
@@ -35,20 +35,14 @@ k8s-op-short = "Kubernetes Operator"
 k8s-api-version = "v1.26"
 k8s-crds = "`CustomResourceDefinitions <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
 k8s-crd = "`CustomResourceDefinition <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
-bndl-version = "4.2.2"
-bndl-version-val = "``4.2.11-ent``"
 appdb-agent-version = "10.2.15.5958-1_4.2.11-ent"
-appdb-init-version = "1.0.6"
 om-version = "6.0.0"
 om-version-val = "``6.0.0``"
-ops-manager-init-version = "1.0.3"
-database-init-version = "1.0.2"
 mdbtools-version = "100.1.0"
 mdbagent = "MongoDB Agent"
 mdb-ent-db = "MongoDB Enterprise Database"
-mdb-ent-db-version = "2.0.0"
 mdb-support = "`MongoDB Support <https://support.mongodb.com/welcome>`__"
-version = "1.23"
+version = "1.25"
 
 [substitutions]
 copy = "unicode:: U+000A9"
diff --git a/source/includes/install/replace-om-versions.rst b/source/includes/install/replace-om-versions.rst
@@ -0,0 +1,3 @@
+.. note:: 
+
+   Replace ``<om-version>`` with the |onprem| version that you're installing.
diff --git a/source/includes/install/replace-op-and-om-versions.rst b/source/includes/install/replace-op-and-om-versions.rst
diff --git a/source/includes/op-setting-descs/init-appdb-version.rst b/source/includes/op-setting-descs/init-appdb-version.rst
@@ -1,4 +1,4 @@
 Version of the ``initContainer`` image that contains the Application
 Database start-up scripts and the readiness probe.
 
-The default value is **{+appdb-init-version+}**.
+The default value is **{+version+}**.
diff --git a/source/includes/op-setting-descs/init-database-version.rst b/source/includes/op-setting-descs/init-database-version.rst
@@ -1,4 +1,4 @@
 Version of the ``initContainer`` image that contains the {+mdbagent+}
 start-up scripts and the readiness probe.
 
-The default value is **{+database-init-version+}**.
+The default value is **{+version+}**.
diff --git a/source/includes/op-setting-descs/init-ops-manager-version.rst b/source/includes/op-setting-descs/init-ops-manager-version.rst
@@ -1,4 +1,4 @@
 Version of the ``initContainer`` image that contains the |onprem| 
 start-up scripts and the readiness probe.
 
-The default value is **{+ops-manager-init-version+}**.
+The default value is **{+version+}**.
diff --git a/source/includes/quay-archive.rst b/source/includes/quay-archive.rst
@@ -1,9 +1,8 @@
 .. code-block:: sh
 
-   docker save quay.io/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
-   docker save quay.io/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
+   docker save quay.io/mongodb/mongodb-enterprise-operator:{+version+} -o mongodb-enterprise-operator.tar; \
+   docker save quay.io/mongodb/mongodb-enterprise-database:{+version+} -o mongodb-enterprise-database.tar; \
    docker save quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
-   docker save quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
-   docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
-   docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
-   docker save quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
+   docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+version+} -o mongodb-enterprise-init-ops-manager.tar; \
+   docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+version+} -o mongodb-enterprise-init-appdb.tar;
+   docker save quay.io/mongodb/mongodb-enterprise-init-database:{+version+} -o mongodb-enterprise-init-database.tar;
diff --git a/source/includes/quaypull.rst b/source/includes/quaypull.rst
@@ -1,9 +1,8 @@
 .. code-block:: sh
 
-   docker pull quay.io/mongodb/mongodb-enterprise-operator:<op-version>; \
-   docker pull quay.io/mongodb/mongodb-enterprise-database:<db-version>; \
+   docker pull quay.io/mongodb/mongodb-enterprise-operator:{+version+}; \
+   docker pull quay.io/mongodb/mongodb-enterprise-database:{+version+}; \
    docker pull quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
-   docker pull quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
-   docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
-   docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
-   docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
+   docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+version+}; \
+   docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+version+}; \
+   docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+version+};
diff --git a/source/includes/rh-archive.rst b/source/includes/rh-archive.rst
@@ -1,9 +1,9 @@
 .. code-block:: sh
 
-   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
-   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
+   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:{+version+} -o mongodb-enterprise-operator.tar; \
+   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:{+version+} -o mongodb-enterprise-database.tar; \
    docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
    docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
-   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
-   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
-   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
+   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+version+} -o mongodb-enterprise-init-ops-manager.tar; \
+   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+version+} -o mongodb-enterprise-init-appdb.tar;
+   docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+version+} -o mongodb-enterprise-init-database.tar;
diff --git a/source/includes/rhpull.rst b/source/includes/rhpull.rst
@@ -1,9 +1,9 @@
 .. code-block:: sh
 
-   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version>; \
-   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version>; \
+   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:{+version+}; \
+   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:{+version+}; \
    docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
    docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
-   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
-   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
-   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
+   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+version+}; \
+   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+version+}; \
+   docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+version+};
diff --git a/source/includes/steps-install-k8s-offline-helm-host.yaml b/source/includes/steps-install-k8s-offline-helm-host.yaml
@@ -9,7 +9,7 @@ content: |
 
   .. include:: /includes/quaypull.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
 
 ---
 ref: helm-k8s-offline-host-archive-files
@@ -21,7 +21,7 @@ content: |
 
   .. include:: /includes/quay-archive.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
 
 ---
 ref: helm-k8s-offline-copy-tar
@@ -39,7 +39,7 @@ content: |
 
   .. include:: /includes/quayimport.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
 
 ---
 ref: helm-k8s-online-install
diff --git a/source/includes/steps-install-os-offline-helm-host.yaml b/source/includes/steps-install-os-offline-helm-host.yaml
@@ -9,7 +9,7 @@ content: |
 
   .. include:: /includes/rhpull.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
 
 ---
 ref: helm-os-offline-host-archive-files
@@ -21,7 +21,7 @@ content: |
 
   .. include:: /includes/quay-archive.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
 
 ---
 ref: helm-os-offline-copy-tar
@@ -39,7 +39,7 @@ content: |
 
   .. include:: /includes/rhimport.rst
 
-  .. include:: /includes/install/replace-op-and-om-versions.rst
+  .. include:: /includes/install/replace-om-versions.rst
  
 ---
 ref: helm-k8s-online-install
diff --git a/source/reference/helm-operator-settings.txt b/source/reference/helm-operator-settings.txt
@@ -73,7 +73,7 @@ The default value is **mongodb-enterprise-database**.
 
       database:
         name: mongodb-enterprise-database
-        version: 2.0.0
+        version: {+version+}
 
 .. _helm-database-version:
 
@@ -88,7 +88,7 @@ database.version
 
       database:
         name: mongodb-enterprise-database
-        version: {+mdb-ent-db-version+}
+        version: {+version+}
 
 initAppDb.name
 --------------
@@ -104,7 +104,7 @@ The default value is **mongodb-enterprise-init-appdb**.
 
       database:
         name: mongodb-enterprise-init-appdb
-        version: {+appdb-init-version+}
+        version: {+version+}
 
 initAppDb.version
 -----------------
@@ -117,7 +117,7 @@ initAppDb.version
 
       database:
         name: mongodb-enterprise-init-appdb
-        version: {+appdb-init-version+}
+        version: {+version+}
 
 initDatabase.name
 -----------------
@@ -133,7 +133,7 @@ The default value is **mongodb-enterprise-init-database**.
 
       database:
         name: mongodb-enterprise-init-database
-        version: {+database-init-version+}
+        version: {+version+}
 
 initDatabase.version
 --------------------
@@ -146,7 +146,7 @@ initDatabase.version
 
       database:
         name: mongodb-enterprise-init-database
-        version: {+database-init-version+}
+        version: {+version+}
 
 initOpsManager.name
 -------------------
@@ -162,7 +162,7 @@ The default value is **mongodb-enterprise-init-ops-manager**.
 
       database:
         name: mongodb-enterprise-init-ops-manager
-        version: {+ops-manager-init-version+}
+        version: {+version+}
 
 initOpsManager.version
 ----------------------
@@ -175,7 +175,7 @@ initOpsManager.version
 
       database:
         name: mongodb-enterprise-init-ops-manager
-        version: {+ops-manager-init-version+}
+        version: {+version+}
 
 managedSecurityContext
 ----------------------
diff --git a/source/reference/kubectl-operator-settings.txt b/source/reference/kubectl-operator-settings.txt
@@ -140,7 +140,7 @@ DATABASE_VERSION
                 imagePullPolicy: <policyChoice>
                 env:
                   - name: DATABASE_VERSION
-                    value: {+mdb-ent-db-version+}
+                    value: {+version+}
 
 IMAGE_PULL_POLICY
 -----------------
@@ -206,7 +206,7 @@ INIT_APPDB_VERSION
                 imagePullPolicy: <policyChoice>
                 env:
                   - name: INIT_APPDB_VERSION
-                    value: {+appdb-init-version+}
+                    value: {+version+}
 
 INIT_DATABASE_IMAGE_REPOSITORY
 ------------------------------
@@ -250,7 +250,7 @@ INIT_DATABASE_VERSION
                 imagePullPolicy: <policyChoice>
                 env:
                   - name: INIT_DATABASE_VERSION
-                    value: {+database-init-version+}
+                    value: {+version+}
 
 INIT_OPS_MANAGER_IMAGE_REPOSITORY
 ---------------------------------
@@ -295,7 +295,7 @@ INIT_OPS_MANAGER_VERSION
                   imagePullPolicy: <policyChoice>
                   env:
                     - name: INIT_OPS_MANAGER_VERSION
-                      value: {+ops-manager-init-version+}
+                      value: {+version+}
 
 MANAGED_SECURITY_CONTEXT
 ------------------------
diff --git a/source/release-notes.txt b/source/release-notes.txt
@@ -63,6 +63,9 @@ Warnings and Breaking Changes
   - ``quay.io/mongodb/mongodb-enterprise-init-appdb-ubi``
   - ``quay.io/mongodb/mongodb-enterprise-init-ops-manager-ubi``
 
+  To learn more, see :ref:`meko-op-install-settings-kubectl-oc` 
+  and :ref:`meko-op-install-settings-helm`.
+
 - Replaces ``spec.exposedExternally`` (deprecated in |k8s-op-short| 1.19) with 
   :setting:`spec.externalAccess`.
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+.. note::`
	`2`	`+`
	`3`	+ Replace ``<om-version>`` with the \|onprem\| version that you're installing.