Skip to content

Commit 05772b9

Browse files
(DOCSP-14002): add appdb-agent-version env variable (#472)
* (DOCSP-14002): add appdb-agent-version env variable * (DOCSP-14002): use latest image versions for v1.9 * (DOCSP-14002): use variables for enterprise-appdb image version
1 parent e93e628 commit 05772b9

File tree

6 files changed

+70
-11
lines changed

6 files changed

+70
-11
lines changed

conf.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@
6969
'old-version': '4.0.14',
7070
'old-version-val': '``4.0.14-ent``',
7171
'old-version-example': '4.0.14-ent',
72-
'appdb-init-version' : '1.0.4',
73-
'ops-manager-init-version': '1.0.2',
74-
'database-init-version': '1.0.0',
75-
'mdbtools-version': '100.1.0'
72+
'appdb-init-version' : '1.0.6',
73+
'ops-manager-init-version': '1.0.3',
74+
'database-init-version': '1.0.2',
75+
'mdbtools-version': '100.1.0',
76+
'appdb-agent-version': '10.2.15.5958-1_4.2.11-ent'
7677
}
7778

7879
rst_epilog = '\n'.join([

snooty.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ aagents = "MongoDB Agents or legacy Automation Agents"
66
k8s-op-short = "Kubernetes Operator"
77
bndl-version = "4.2.2"
88
bndl-version-val = "``4.2.11-ent``"
9-
appdb-init-version = "1.0.4"
10-
ops-manager-init-version = "1.0.2"
11-
database-init-version = "1.0.0"
9+
appdb-init-version = "1.0.6"
10+
ops-manager-init-version = "1.0.3"
11+
database-init-version = "1.0.2"
1212
mdbtools-version = "100.1.0"
13+
appdb-agent-version = "10.2.15.5958-1_4.2.11-ent"
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Version of the image that contains the {+mdbagent+} that the Application
2+
Database uses.
3+
4+
The default value is {+appdb-agent-version+}.

source/includes/steps-helm-master.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ replacement:
197197
docker save quay.io/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
198198
docker save quay.io/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
199199
docker save quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
200-
docker save quay.io/mongodb/mongodb-enterprise-appdb:latest -o mongodb-enterprise-appdb.tar; \
200+
docker save quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
201201
docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
202202
docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
203203
docker save quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
@@ -209,7 +209,7 @@ replacement:
209209
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version> -o mongodb-enterprise-operator.tar; \
210210
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
211211
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
212-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:latest -o mongodb-enterprise-appdb.tar; \
212+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+} -o mongodb-enterprise-appdb.tar; \
213213
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
214214
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
215215
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
@@ -262,7 +262,7 @@ replacement:
262262
docker pull quay.io/mongodb/mongodb-enterprise-operator:<op-version>; \
263263
docker pull quay.io/mongodb/mongodb-enterprise-database:<db-version>; \
264264
docker pull quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
265-
docker pull quay.io/mongodb/mongodb-enterprise-appdb:latest; \
265+
docker pull quay.io/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
266266
docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
267267
docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
268268
docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
@@ -274,7 +274,7 @@ replacement:
274274
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-operator:<op-version>; \
275275
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version>; \
276276
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
277-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:latest; \
277+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:{+appdb-agent-version+}; \
278278
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
279279
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
280280
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+};

source/reference/helm-operator-settings.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,37 @@ registry.appDb
180180
registry:
181181
appDb: registry.connect.redhat.com/mongodb
182182

183+
registry.appDb.version
184+
----------------------
185+
186+
.. include:: /includes/op-setting-descs/appdb-agent-version.rst
187+
188+
.. tabs::
189+
190+
.. tab:: Kubernetes
191+
:tabid: k8s
192+
193+
.. example::
194+
195+
.. code-block:: yaml
196+
:emphasize-lines: 3
197+
198+
registry:
199+
appDb: quay.io/mongodb
200+
version: {+appdb-agent-version+}
201+
202+
.. tab:: OpenShift
203+
:tabid: os
204+
205+
.. example::
206+
207+
.. code-block:: yaml
208+
:emphasize-lines: 3
209+
210+
registry:
211+
appDb: registry.connect.redhat.com/mongodb
212+
version: {+appdb-agent-version+}
213+
183214
registry.imagePullSecrets
184215
-------------------------
185216

source/reference/kubectl-operator-settings.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,28 @@ add it as a new array of key-value pair mappings in the
4646
- name: APPDB_IMAGE_REPOSITORY
4747
value: quay.io/mongodb/mongodb-enterprise-appdb
4848

49+
APPDB_AGENT_VERSION
50+
-------------------
51+
52+
.. include:: /includes/op-setting-descs/appdb-agent-version.rst
53+
54+
.. example::
55+
56+
.. code-block:: yaml
57+
:linenos:
58+
:emphasize-lines: 9-11
59+
60+
spec:
61+
template:
62+
spec:
63+
serviceAccountName: mongodb-enterprise-operator
64+
containers:
65+
- name: mongodb-enterprise-operator
66+
image: <operatorVersionUrl>
67+
imagePullPolicy: <policyChoice>
68+
env:
69+
- name: APPDB_AGENT_VERSION
70+
value: {+appdb-agent-version+}
4971

5072
APPDB_IMAGE_REPOSITORY
5173
----------------------

0 commit comments

Comments
 (0)