Skip to content

Commit 19467f0

Browse files
davidhou17davidhou17
authored
(DOCSP-30878): Align versions for MEKO dependent images (#1562)
* 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
1 parent 0a453c2 commit 19467f0

15 files changed

+48
-60
lines changed

‎snooty.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,14 @@ k8s-op-short = "Kubernetes Operator"
3535
k8s-api-version = "v1.26"
3636
k8s-crds = "`CustomResourceDefinitions <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
3737
k8s-crd = "`CustomResourceDefinition <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
38-
bndl-version = "4.2.2"
39-
bndl-version-val = "``4.2.11-ent``"
4038
appdb-agent-version = "10.2.15.5958-1_4.2.11-ent"
41-
appdb-init-version = "1.0.6"
4239
om-version = "6.0.0"
4340
om-version-val = "``6.0.0``"
44-
ops-manager-init-version = "1.0.3"
45-
database-init-version = "1.0.2"
4641
mdbtools-version = "100.1.0"
4742
mdbagent = "MongoDB Agent"
4843
mdb-ent-db = "MongoDB Enterprise Database"
49-
mdb-ent-db-version = "2.0.0"
5044
mdb-support = "`MongoDB Support <https://support.mongodb.com/welcome>`__"
51-
version = "1.23"
45+
version = "1.25"
5246

5347
[substitutions]
5448
copy = "unicode:: U+000A9"

‎source/includes/install/replace-om-versions.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.. note::
2+
3+
Replace ``<om-version>`` with the |onprem| version that you're installing.

‎source/includes/install/replace-op-and-om-versions.rst

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎source/includes/op-setting-descs/init-appdb-version.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Version of the ``initContainer`` image that contains the Application
22
Database start-up scripts and the readiness probe.
33

4-
The default value is **{+appdb-init-version+}**.
4+
The default value is **{+version+}**.

‎source/includes/op-setting-descs/init-database-version.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Version of the ``initContainer`` image that contains the {+mdbagent+}
22
start-up scripts and the readiness probe.
33

4-
The default value is **{+database-init-version+}**.
4+
The default value is **{+version+}**.

‎source/includes/op-setting-descs/init-ops-manager-version.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Version of the ``initContainer`` image that contains the |onprem|
22
start-up scripts and the readiness probe.
33

4-
The default value is **{+ops-manager-init-version+}**.
4+
The default value is **{+version+}**.

‎source/includes/quay-archive.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.. code-block:: sh
22
3-
docker save quay.io/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
4-
docker save quay.io/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
3+
docker save quay.io/mongodb/mongodb-enterprise-operator:{+version+} -o mongodb-enterprise-operator.tar; \
4+
docker save quay.io/mongodb/mongodb-enterprise-database:{+version+} -o mongodb-enterprise-database.tar; \
55
docker save quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
6-
docker save quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
7-
docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
8-
docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
9-
docker save quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
6+
docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+version+} -o mongodb-enterprise-init-ops-manager.tar; \
7+
docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+version+} -o mongodb-enterprise-init-appdb.tar;
8+
docker save quay.io/mongodb/mongodb-enterprise-init-database:{+version+} -o mongodb-enterprise-init-database.tar;

‎source/includes/quaypull.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
.. code-block:: sh
22
3-
docker pull quay.io/mongodb/mongodb-enterprise-operator:<op-version>; \
4-
docker pull quay.io/mongodb/mongodb-enterprise-database:<db-version>; \
3+
docker pull quay.io/mongodb/mongodb-enterprise-operator:{+version+}; \
4+
docker pull quay.io/mongodb/mongodb-enterprise-database:{+version+}; \
55
docker pull quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
6-
docker pull quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
7-
docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
8-
docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
9-
docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
6+
docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+version+}; \
7+
docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+version+}; \
8+
docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+version+};

‎source/includes/rh-archive.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. code-block:: sh
22
3-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
4-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
3+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:{+version+} -o mongodb-enterprise-operator.tar; \
4+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:{+version+} -o mongodb-enterprise-database.tar; \
55
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
66
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
7-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
8-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
9-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
7+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+version+} -o mongodb-enterprise-init-ops-manager.tar; \
8+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+version+} -o mongodb-enterprise-init-appdb.tar;
9+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+version+} -o mongodb-enterprise-init-database.tar;

‎source/includes/rhpull.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.. code-block:: sh
22
3-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version>; \
4-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version>; \
3+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:{+version+}; \
4+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:{+version+}; \
55
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
66
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
7-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
8-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
9-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
7+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+version+}; \
8+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+version+}; \
9+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+version+};

‎source/includes/steps-install-k8s-offline-helm-host.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ content: |
99
1010
.. include:: /includes/quaypull.rst
1111
12-
.. include:: /includes/install/replace-op-and-om-versions.rst
12+
.. include:: /includes/install/replace-om-versions.rst
1313
1414
---
1515
ref: helm-k8s-offline-host-archive-files
@@ -21,7 +21,7 @@ content: |
2121
2222
.. include:: /includes/quay-archive.rst
2323
24-
.. include:: /includes/install/replace-op-and-om-versions.rst
24+
.. include:: /includes/install/replace-om-versions.rst
2525
2626
---
2727
ref: helm-k8s-offline-copy-tar
@@ -39,7 +39,7 @@ content: |
3939
4040
.. include:: /includes/quayimport.rst
4141
42-
.. include:: /includes/install/replace-op-and-om-versions.rst
42+
.. include:: /includes/install/replace-om-versions.rst
4343
4444
---
4545
ref: helm-k8s-online-install

‎source/includes/steps-install-os-offline-helm-host.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ content: |
99
1010
.. include:: /includes/rhpull.rst
1111
12-
.. include:: /includes/install/replace-op-and-om-versions.rst
12+
.. include:: /includes/install/replace-om-versions.rst
1313
1414
---
1515
ref: helm-os-offline-host-archive-files
@@ -21,7 +21,7 @@ content: |
2121
2222
.. include:: /includes/quay-archive.rst
2323
24-
.. include:: /includes/install/replace-op-and-om-versions.rst
24+
.. include:: /includes/install/replace-om-versions.rst
2525
2626
---
2727
ref: helm-os-offline-copy-tar
@@ -39,7 +39,7 @@ content: |
3939
4040
.. include:: /includes/rhimport.rst
4141
42-
.. include:: /includes/install/replace-op-and-om-versions.rst
42+
.. include:: /includes/install/replace-om-versions.rst
4343
4444
---
4545
ref: helm-k8s-online-install

‎source/reference/helm-operator-settings.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The default value is **mongodb-enterprise-database**.
7373

7474
database:
7575
name: mongodb-enterprise-database
76-
version: 2.0.0
76+
version: {+version+}
7777

7878
.. _helm-database-version:
7979

@@ -88,7 +88,7 @@ database.version
8888

8989
database:
9090
name: mongodb-enterprise-database
91-
version: {+mdb-ent-db-version+}
91+
version: {+version+}
9292

9393
initAppDb.name
9494
--------------
@@ -104,7 +104,7 @@ The default value is **mongodb-enterprise-init-appdb**.
104104

105105
database:
106106
name: mongodb-enterprise-init-appdb
107-
version: {+appdb-init-version+}
107+
version: {+version+}
108108

109109
initAppDb.version
110110
-----------------
@@ -117,7 +117,7 @@ initAppDb.version
117117

118118
database:
119119
name: mongodb-enterprise-init-appdb
120-
version: {+appdb-init-version+}
120+
version: {+version+}
121121

122122
initDatabase.name
123123
-----------------
@@ -133,7 +133,7 @@ The default value is **mongodb-enterprise-init-database**.
133133

134134
database:
135135
name: mongodb-enterprise-init-database
136-
version: {+database-init-version+}
136+
version: {+version+}
137137

138138
initDatabase.version
139139
--------------------
@@ -146,7 +146,7 @@ initDatabase.version
146146

147147
database:
148148
name: mongodb-enterprise-init-database
149-
version: {+database-init-version+}
149+
version: {+version+}
150150

151151
initOpsManager.name
152152
-------------------
@@ -162,7 +162,7 @@ The default value is **mongodb-enterprise-init-ops-manager**.
162162

163163
database:
164164
name: mongodb-enterprise-init-ops-manager
165-
version: {+ops-manager-init-version+}
165+
version: {+version+}
166166

167167
initOpsManager.version
168168
----------------------
@@ -175,7 +175,7 @@ initOpsManager.version
175175

176176
database:
177177
name: mongodb-enterprise-init-ops-manager
178-
version: {+ops-manager-init-version+}
178+
version: {+version+}
179179

180180
managedSecurityContext
181181
----------------------

‎source/reference/kubectl-operator-settings.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ DATABASE_VERSION
140140
imagePullPolicy: <policyChoice>
141141
env:
142142
- name: DATABASE_VERSION
143-
value: {+mdb-ent-db-version+}
143+
value: {+version+}
144144

145145
IMAGE_PULL_POLICY
146146
-----------------
@@ -206,7 +206,7 @@ INIT_APPDB_VERSION
206206
imagePullPolicy: <policyChoice>
207207
env:
208208
- name: INIT_APPDB_VERSION
209-
value: {+appdb-init-version+}
209+
value: {+version+}
210210

211211
INIT_DATABASE_IMAGE_REPOSITORY
212212
------------------------------
@@ -250,7 +250,7 @@ INIT_DATABASE_VERSION
250250
imagePullPolicy: <policyChoice>
251251
env:
252252
- name: INIT_DATABASE_VERSION
253-
value: {+database-init-version+}
253+
value: {+version+}
254254

255255
INIT_OPS_MANAGER_IMAGE_REPOSITORY
256256
---------------------------------
@@ -295,7 +295,7 @@ INIT_OPS_MANAGER_VERSION
295295
imagePullPolicy: <policyChoice>
296296
env:
297297
- name: INIT_OPS_MANAGER_VERSION
298-
value: {+ops-manager-init-version+}
298+
value: {+version+}
299299

300300
MANAGED_SECURITY_CONTEXT
301301
------------------------

‎source/release-notes.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ Warnings and Breaking Changes
6363
- ``quay.io/mongodb/mongodb-enterprise-init-appdb-ubi``
6464
- ``quay.io/mongodb/mongodb-enterprise-init-ops-manager-ubi``
6565

66+
To learn more, see :ref:`meko-op-install-settings-kubectl-oc`
67+
and :ref:`meko-op-install-settings-helm`.
68+
6669
- Replaces ``spec.exposedExternally`` (deprecated in |k8s-op-short| 1.19) with
6770
:setting:`spec.externalAccess`.
6871

0 commit comments

Comments
 (0)