Skip to content

Commit fad82b1

Browse files
jwilliams-mongojwilliams-mongo
authored
(DOCSP-12561): Add new Operator configuration properties (INIT_DATABA… (#390)
* (DOCSP-12561): Add new Operator configuration properties (INIT_DATABASE_VERSION and INIT_DATABASE_REPOSITORY) * (DOCSP-12561): fix ops manager init container image name
1 parent 4ecdd7d commit fad82b1

File tree

5 files changed

+164
-36
lines changed

5 files changed

+164
-36
lines changed

‎conf.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@
7070
'old-version': '4.0.14',
7171
'old-version-val': '``4.0.14-ent``',
7272
'old-version-example': '4.0.14-ent',
73+
'appdb-init-version' : '1.0.4',
74+
'ops-manager-init-version': '1.0.2',
75+
'database-init-version': '1.0.0',
7376
}
7477

7578
rst_epilog = '\n'.join([

‎snooty.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ 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.2-ent``"
9+
appdb-init-version = "1.0.4"
10+
ops-manager-init-version = "1.0.2"
11+
database-init-version = "1.0.0"

‎source/includes/list-tables/k8s-kubectl-install-options.rst

Lines changed: 71 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@
238238
downloaded.
239239

240240
Default value is
241-
``quay.io/mongodb/mongodb-enterprise-ops-manager-init``.
241+
``quay.io/mongodb/mongodb-enterprise-init-ops-manager``.
242242

243243
.. code-block:: yaml
244244
245245
spec.template.spec.containers.name.env.name:
246246
INIT_OPS_MANAGER_IMAGE_REPOSITORY
247247
spec.template.spec.containers.name.env.value:
248-
quay.io/mongodb/mongodb-enterprise-ops-manager-init
248+
quay.io/mongodb/mongodb-enterprise-init-ops-manager
249249
250250
.. example::
251251

@@ -263,20 +263,18 @@
263263
imagePullPolicy: <policyChoice>
264264
env:
265265
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
266-
value: quay.io/mongodb/mongodb-enterprise-ops-manager-init
266+
value: quay.io/mongodb/mongodb-enterprise-init-ops-manager
267267
268268
* - ``INIT_OPS_MANAGER_VERSION``
269269
- Version of the initContainer image that contains |onprem|
270270
start-up scripts and the readiness probe.
271271

272-
Default value is ``latest``.
273-
274272
.. code-block:: yaml
275273
276274
spec.template.spec.containers.name.env.name:
277275
INIT_OPS_MANAGER_VERSION
278276
spec.template.spec.containers.name.env.value:
279-
latest
277+
{+ops-manager-init-version+}
280278
281279
.. example::
282280

@@ -294,7 +292,7 @@
294292
imagePullPolicy: <policyChoice>
295293
env:
296294
- name: INIT_OPS_MANAGER_VERSION
297-
value: latest
295+
value: {+ops-manager-init-version+}
298296
299297
* - ``APPDB_IMAGE_REPOSITORY``
300298
- |url| of the repository from which the Application Database image
@@ -362,17 +360,15 @@
362360
value: quay.io/mongodb/mongodb-enterprise-init-appdb
363361
364362
* - ``INIT_APPDB_VERSION``
365-
- Version of the initContainer image that contains |onprem|
366-
start-up scripts and the readiness probe.
367-
368-
Default value is ``latest``.
363+
- Version of the initContainer image that contains Application
364+
Database start-up scripts and the readiness probe.
369365

370366
.. code-block:: yaml
371367
372368
spec.template.spec.containers.name.env.name:
373369
INIT_APPDB_VERSION
374370
spec.template.spec.containers.name.env.value:
375-
latest
371+
{+appdb-init-version+}
376372
377373
.. example::
378374

@@ -390,7 +386,69 @@
390386
imagePullPolicy: <policyChoice>
391387
env:
392388
- name: INIT_APPDB_VERSION
393-
value: latest
389+
value: {+appdb-init-version+}
390+
391+
* - ``INIT_DATABASE_IMAGE_REPOSITORY``
392+
- |url| of the repository from which the initContainer image that
393+
contains {+mdbagent+} start-up scripts and the readiness
394+
probe is downloaded.
395+
396+
Default value is
397+
``quay.io/mongodb/mongodb-enterprise-init-database``.
398+
399+
.. code-block:: yaml
400+
401+
spec.template.spec.containers.name.env.name:
402+
INIT_DATABASE_IMAGE_REPOSITORY
403+
spec.template.spec.containers.name.env.value:
404+
quay.io/mongodb/mongodb-enterprise-init-database
405+
406+
.. example::
407+
408+
.. code-block:: yaml
409+
:linenos:
410+
:emphasize-lines: 9-11
411+
412+
spec:
413+
template:
414+
spec:
415+
serviceAccountName: mongodb-enterprise-operator
416+
containers:
417+
- name: mongodb-enterprise-operator
418+
image: <operatorVersionUrl>
419+
imagePullPolicy: <policyChoice>
420+
env:
421+
- name: INIT_DATABASE_IMAGE_REPOSITORY
422+
value: quay.io/mongodb/mongodb-enterprise-init-database
423+
424+
* - ``INIT_DATABASE_VERSION``
425+
- Version of the initContainer image that contains {+mdbagent+}
426+
start-up scripts and the readiness probe.
427+
428+
.. code-block:: yaml
429+
430+
spec.template.spec.containers.name.env.name:
431+
INIT_DATABASE_VERSION
432+
spec.template.spec.containers.name.env.value:
433+
{+database-init-version+}
434+
435+
.. example::
436+
437+
.. code-block:: yaml
438+
:linenos:
439+
:emphasize-lines: 9-11
440+
441+
spec:
442+
template:
443+
spec:
444+
serviceAccountName: mongodb-enterprise-operator
445+
containers:
446+
- name: mongodb-enterprise-operator
447+
image: <operatorVersionUrl>
448+
imagePullPolicy: <policyChoice>
449+
env:
450+
- name: INIT_DATABASE_VERSION
451+
value: {+database-init-version+}
394452
395453
* - ``MANAGED_SECURITY_CONTEXT``
396454
- Flag that determines if the |k8s-op-short| inherits the

‎source/includes/list-tables/k8s-oc-install-options.rst

Lines changed: 69 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@
239239
downloaded.
240240

241241
Default value is
242-
``registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager-init``.
242+
``registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager``.
243243

244244
.. code-block:: yaml
245245
246246
spec.template.spec.containers.name.env.name:
247247
INIT_OPS_MANAGER_IMAGE_REPOSITORY
248248
spec.template.spec.containers.name.env.value:
249-
registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager-init
249+
registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
250250
251251
.. example::
252252

@@ -264,20 +264,18 @@
264264
imagePullPolicy: <policyChoice>
265265
env:
266266
- name: INIT_OPS_MANAGER_IMAGE_REPOSITORY
267-
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager-init
267+
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager
268268
269269
* - ``INIT_OPS_MANAGER_VERSION``
270270
- Version of the initContainer image that contains |onprem|
271271
start-up scripts and the readiness probe.
272272

273-
Default value is ``latest``.
274-
275273
.. code-block:: yaml
276274
277275
spec.template.spec.containers.name.env.name:
278276
INIT_OPS_MANAGER_VERSION
279277
spec.template.spec.containers.name.env.value:
280-
latest
278+
{+ops-manager-init-version+}
281279
282280
.. example::
283281

@@ -295,7 +293,7 @@
295293
imagePullPolicy: <policyChoice>
296294
env:
297295
- name: INIT_OPS_MANAGER_VERSION
298-
value: latest
296+
value: {+ops-manager-init-version+}
299297
300298
* - ``APPDB_IMAGE_REPOSITORY``
301299
- |url| of the repository from which the Application Database
@@ -366,14 +364,12 @@
366364
- Version of the ``initContainer`` image that contains |onprem|
367365
start-up scripts and the readiness probe.
368366

369-
Default value is ``latest``.
370-
371367
.. code-block:: yaml
372368
373369
spec.template.spec.containers.name.env.name:
374370
INIT_APPDB_VERSION
375371
spec.template.spec.containers.name.env.value:
376-
latest
372+
{+appdb-init-version+}
377373
378374
.. example::
379375

@@ -391,7 +387,69 @@
391387
imagePullPolicy: <policyChoice>
392388
env:
393389
- name: INIT_APPDB_VERSION
394-
value: latest
390+
value: {+appdb-init-version+}
391+
392+
* - ``INIT_DATABASE_IMAGE_REPOSITORY``
393+
- |url| of the repository from which the initContainer image that
394+
contains {+mdbagent+} start-up scripts and the readiness
395+
probe is downloaded.
396+
397+
Default value is
398+
``registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database``.
399+
400+
.. code-block:: yaml
401+
402+
spec.template.spec.containers.name.env.name:
403+
INIT_DATABASE_IMAGE_REPOSITORY
404+
spec.template.spec.containers.name.env.value:
405+
registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
406+
407+
.. example::
408+
409+
.. code-block:: yaml
410+
:linenos:
411+
:emphasize-lines: 9-11
412+
413+
spec:
414+
template:
415+
spec:
416+
serviceAccountName: mongodb-enterprise-operator
417+
containers:
418+
- name: mongodb-enterprise-operator
419+
image: <operatorVersionUrl>
420+
imagePullPolicy: <policyChoice>
421+
env:
422+
- name: INIT_DATABASE_IMAGE_REPOSITORY
423+
value: registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database
424+
425+
* - ``INIT_DATABASE_VERSION``
426+
- Version of the initContainer image that contains {+mdbagent+}
427+
start-up scripts and the readiness probe.
428+
429+
.. code-block:: yaml
430+
431+
spec.template.spec.containers.name.env.name:
432+
INIT_DATABASE_VERSION
433+
spec.template.spec.containers.name.env.value:
434+
{+database-init-version+}
435+
436+
.. example::
437+
438+
.. code-block:: yaml
439+
:linenos:
440+
:emphasize-lines: 9-11
441+
442+
spec:
443+
template:
444+
spec:
445+
serviceAccountName: mongodb-enterprise-operator
446+
containers:
447+
- name: mongodb-enterprise-operator
448+
image: <operatorVersionUrl>
449+
imagePullPolicy: <policyChoice>
450+
env:
451+
- name: INIT_DATABASE_VERSION
452+
value: {+database-init-version+}
395453
396454
* - ``MANAGED_SECURITY_CONTEXT``
397455
- Flag that determines if the |k8s-op-short| inherits the

‎source/includes/steps-helm-master.yaml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,9 @@ replacement:
360360
docker save quay.io/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
361361
docker save quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
362362
docker save quay.io/mongodb/mongodb-enterprise-appdb:latest -o mongodb-enterprise-appdb.tar; \
363-
docker save quay.io/mongodb/mongodb-enterprise-ops-manager-init:latest -o mongodb-enterprise-ops-manager-init.tar; \
364-
docker save quay.io/mongodb/mongodb-enterprise-init-appdb:latest -o mongodb-enterprise-init-appdb.tar
363+
docker save quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
364+
docker save quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
365+
docker save quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
365366
366367
rharchive: |
367368
@@ -371,8 +372,9 @@ replacement:
371372
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version> -o mongodb-enterprise-database.tar; \
372373
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version> -o mongodb-enterprise-ops-manager.tar; \
373374
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:latest -o mongodb-enterprise-appdb.tar; \
374-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager-init:latest -o mongodb-enterprise-ops-manager-init.tar; \
375-
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:latest -o mongodb-enterprise-init-appdb.tar
375+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+} -o mongodb-enterprise-init-ops-manager.tar; \
376+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+} -o mongodb-enterprise-init-appdb.tar;
377+
docker save registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+} -o mongodb-enterprise-init-database.tar;
376378
377379
---
378380
title: "Copy these ``.tar`` files to the host running the
@@ -394,8 +396,9 @@ replacement:
394396
docker load -i mongodb-enterprise-database.tar; \
395397
docker load -i mongodb-enterprise-ops-manager.tar; \
396398
docker load -i mongodb-enterprise-appdb.tar; \
397-
docker load -i mongodb-enterprise-ops-manager-init.tar
398-
docker load -i mongodb-enterprise-init-appdb.tar
399+
docker load -i mongodb-enterprise-init-ops-manager.tar; \
400+
docker load -i mongodb-enterprise-init-appdb.tar; \
401+
docker load -i mongodb-enterprise-init-database.tar;
399402
400403
rhimport: |
401404
@@ -405,8 +408,9 @@ replacement:
405408
docker load -i mongodb-enterprise-database.tar; \
406409
docker load -i mongodb-enterprise-ops-manager.tar; \
407410
docker load -i mongodb-enterprise-appdb.tar; \
408-
docker load -i mongodb-enterprise-ops-manager-init.tar
409-
docker load -i mongodb-enterprise-init-appdb.tar
411+
docker load -i mongodb-enterprise-init-ops-manager.tar; \
412+
docker load -i mongodb-enterprise-init-appdb.tar; \
413+
docker load -i mongodb-enterprise-init-database.tar;
410414
411415
---
412416
title: "Use ``docker`` to request the files."
@@ -421,8 +425,9 @@ replacement:
421425
docker pull quay.io/mongodb/mongodb-enterprise-database:<db-version>; \
422426
docker pull quay.io/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
423427
docker pull quay.io/mongodb/mongodb-enterprise-appdb:latest; \
424-
docker pull quay.io/mongodb/mongodb-enterprise-ops-manager-init:latest; \
425-
docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:latest
428+
docker pull quay.io/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
429+
docker pull quay.io/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
430+
docker pull quay.io/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
426431
427432
rhpull: |
428433
@@ -432,8 +437,9 @@ replacement:
432437
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-database:<db-version>; \
433438
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager:<om-version>; \
434439
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-appdb:latest; \
435-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-ops-manager-init:latest; \
436-
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:latest
440+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-ops-manager:{+ops-manager-init-version+}; \
441+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-appdb:{+appdb-init-version+}; \
442+
docker pull registry.connect.redhat.com/mongodb/mongodb-enterprise-init-database:{+database-init-version+};
437443
438444
versions: |
439445

0 commit comments

Comments
 (0)