Skip to content

Commit ee85285

Browse files
authored
(DOCSP-44175) Fixes important nested components in MEKO docs (#1898) (#1901)
1 parent b20ea30 commit ee85285

18 files changed

+48
-38
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
:gold:`IMPORTANT:` If you deploy |onprem| with the |k8s-op-short| and
2+
|onprem| will manage MongoDB database resources deployed **outside** of
3+
the |k8s| cluster it's deployed to, you must set ``data.baseUrl`` to
4+
the same value of the :opsmgrkube:`spec.configuration.mms.centralUrl
5+
<spec.configuration>` setting in the |onprem| resource specification.
6+
To learn more, see :ref:`mdb-resource-deployment-locations`.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
:gold:`IMPORTANT:` The |k8s-op-short| tracks any changes to the
2+
ConfigMap and reconciles the state of the |k8s-mdbrsc|.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
:gold:`IMPORTANT:` The |k8s-op-short| tracks any changes to the Secret
2+
and reconciles the state of the |k8s-mdbrsc|.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
You can use the |k8s-op-short| to deploy MongoDB resources with
2+
|cloud-short| and with |onprem| version 6.0.x or later.
3+
4+
You can use the :atlas:`Atlas Operator </reference/atlas-operator/ak8so-quick-start/>`
5+
to deploy MongoDB resources to |service|.
6+
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
:gold:`IMPORTANT:` Ensure that you choose a :ref:`compatible MongoDB
2+
Server version <k8s-mdb-version-compatibility>`. Compatible versions
3+
differ depending on the base image that the MongoDB database resource
4+
uses.

source/includes/list-tables/configmap-keys-curl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
identifies your
5656
|com| :opsmgr:`Organization </tutorial/manage-organizations>`.
5757

58-
.. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
58+
.. include:: /includes/admonitions/note-k8s-supported-in-om4-nested.rst
5959

6060
Specify an :opsmgr:`existing Organization
6161
</tutorial/manage-organizations/#create-organization>`:
@@ -76,7 +76,7 @@
7676
- |url| to your |application| including the |fqdn| and port
7777
number.
7878

79-
.. include:: /includes/admonitions/data-url-config-map-external-dbs.rst
79+
.. include:: /includes/admonitions/data-url-config-map-external-dbs-nested.rst
8080

8181
If you're using |cloud-short|, set the ``data.baseUrl`` value
8282
to ``https://cloud.mongodb.com``.

source/includes/list-tables/configmap-keys.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
You must have the :opsmgr:`Organization Project Creator </reference/user-roles/#Organization Project Creator>`
6767
role to create a new project *within an existing organization*.
6868

69-
.. include:: /includes/admonitions/note-k8s-supported-in-om4.rst
69+
.. include:: /includes/admonitions/note-k8s-supported-in-om4-nested.rst
7070

7171
If you provide an empty string as your ``orgId``, |k8s-op-short|
7272
creates an organization with the same name as your project.
@@ -78,7 +78,7 @@
7878
- |url| to your |application| including the |fqdn| and port
7979
number.
8080

81-
.. include:: /includes/admonitions/data-url-config-map-external-dbs.rst
81+
.. include:: /includes/admonitions/data-url-config-map-external-dbs-nested.rst
8282

8383
If you're using |cloud-short|, set the ``data.baseUrl`` value
8484
to ``https://cloud.mongodb.com``.

source/includes/list-tables/resource-keys-internal-x509.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
- Use this setting to enable
1717
:manual:`X.509 internal cluster authentication </tutorial/configure-x509-member-authentication#x509-internal-authentication>`.
1818

19-
.. important::
20-
21-
Once internal cluster authentication is enabled, it can't
22-
be disabled.
19+
:gold:`IMPORTANT:` Once internal cluster authentication is
20+
enabled, it can't be disabled.
2321

2422
- ``X509``

source/includes/list-tables/rs-multi-cluster-base-options.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
The format should be ``X.Y.Z`` for the Community edition and
2626
``X.Y.Z-ent`` for the Enterprise edition.
2727

28-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
28+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
2929

3030
To learn more about MongoDB versioning, see
3131
:ref:`release-version-numbers` in the MongoDB Manual.
@@ -43,7 +43,7 @@
4343

4444
.. include:: /includes/admonitions/note-namespace-match-configmap.rst
4545

46-
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap.rst
46+
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap-nested.rst
4747

4848
- ``<my-project>``
4949

@@ -98,7 +98,7 @@
9898

9999
.. include:: /includes/admonitions/note-namespace-match-secret.rst
100100

101-
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret.rst
101+
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret-nested.rst
102102

103103
- ``<mycredentials>``
104104

source/includes/list-tables/rs-resource-base-options.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
The format should be ``X.Y.Z`` for the Community edition and
3232
``X.Y.Z-ent`` for the Enterprise edition.
3333

34-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
34+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
3535

3636
To learn more about MongoDB versioning, see
3737
:ref:`release-version-numbers` in the MongoDB Manual.
@@ -49,7 +49,7 @@
4949

5050
.. include:: /includes/admonitions/note-namespace-match-configmap.rst
5151

52-
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap.rst
52+
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap-nested.rst
5353

5454
- ``<myconfigmap>``
5555

@@ -62,7 +62,7 @@
6262

6363
.. include:: /includes/admonitions/note-namespace-match-secret.rst
6464

65-
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret.rst
65+
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret-nested.rst
6666

6767
- ``<mycredentials>``
6868

source/includes/steps-add-database-user.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ content: |
5151
- The subject line of the x509 client certificate signed
5252
by the |k8s| |certauth| (Kube CA).
5353
54-
.. important::
55-
56-
The username must comply with the
57-
`RFC 2253 <https://tools.ietf.org/html/rfc2253>`__
58-
LDAPv3 Distinguished Name standard.
54+
:gold:`IMPORTANT:` The username must comply with the
55+
`RFC 2253 <https://tools.ietf.org/html/rfc2253>`__
56+
LDAPv3 Distinguished Name standard.
5957
6058
To get the subject line of the X.509 certificate, run the
6159
following command:

source/includes/steps-deploy-k8s-opsmgr-http.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ content: |
131131
``X.Y.Z-ubi8`` for the :product:`Enterprise edition
132132
</mongodb-enterprise-advanced>`.
133133
134-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
134+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
135135
136136
To learn more about MongoDB versioning, see
137137
:ref:`release-version-numbers` in the MongoDB Manual.

source/includes/steps-deploy-k8s-opsmgr-https.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ content: |
221221
</mongodb-enterprise-advanced>` and ``X.Y.Z`` for the Community edition.
222222
Do not add the ``-ubi8`` tag suffix to the Community edition image because the |k8s-op-short| adds the tag suffix automatically.
223223
224-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
224+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
225225
226226
To learn more about MongoDB versioning, see
227227
:ref:`release-version-numbers` in the MongoDB Manual.

source/includes/steps-deploy-k8s-sharded-cluster.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ content: |
8989
The format should be ``X.Y.Z`` for the Community edition and
9090
``X.Y.Z-ent`` for the Enterprise edition.
9191
92-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
92+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
9393
9494
To learn more about MongoDB versioning, see
9595
:ref:`release-version-numbers` in the MongoDB Manual.
@@ -104,7 +104,7 @@ content: |
104104
105105
.. include:: /includes/admonitions/note-namespace-match-configmap.rst
106106
107-
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap.rst
107+
.. include:: /includes/admonitions/fact-k8s-operator-manages-configmap-nested.rst
108108
109109
- ``<myproject>``
110110
@@ -117,7 +117,7 @@ content: |
117117
118118
.. include:: /includes/admonitions/note-namespace-match-secret.rst
119119
120-
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret.rst
120+
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret-nested.rst
121121
122122
- ``<mycredentials>``
123123

source/includes/steps-deploy-k8s-standalone.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ content: |
6262
The format should be ``X.Y.Z`` for the Community edition and
6363
``X.Y.Z-ent`` for the Enterprise edition.
6464
65-
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
65+
.. include:: /includes/admonitions/ubi-8-min-db-versions-nested.rst
6666
6767
To learn more about MongoDB versioning, see
6868
:ref:`release-version-numbers` in the MongoDB Manual.
@@ -89,7 +89,7 @@ content: |
8989
9090
.. include:: /includes/admonitions/note-namespace-match-secret.rst
9191
92-
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret.rst
92+
.. include:: /includes/admonitions/fact-k8s-operator-manages-secret-nested.rst
9393
9494
- ``<mycredentials>``
9595

source/includes/steps-set-configmap-for-client-x509.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ content: |
5858
- Forces the Operator to require a valid |tls| certificate
5959
from |mms|.
6060
61-
.. important::
62-
63-
The value must be enclosed in single quotes or the
64-
operator will throw an error.
61+
:gold:`IMPORTANT:` The value must be enclosed in single
62+
quotes or the operator will throw an error.
6563
6664
- ``'true'``
6765

source/includes/steps-set-configmap-for-internal-x509.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ content: |
5959
- Forces the Operator to require a valid |tls| certificate
6060
from |mms|.
6161
62-
.. important::
63-
64-
The value must be enclosed in single quotes or the
65-
operator will throw an error.
62+
:gold:`IMPORTANT:` The value must be enclosed in single
63+
quotes or the operator will throw an error.
6664
6765
- ``'true'``
6866

source/includes/steps-set-configmap-for-tls.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ content: |
5959
- Forces the Operator to require a valid |tls| certificate
6060
from |mms|.
6161
62-
.. important::
63-
64-
The value must be enclosed in single quotes or the
65-
operator will throw an error.
62+
:gold:`IMPORTANT:` The value must be enclosed in single
63+
quotes or the operator will throw an error.
6664
- ``'true'``
6765
---
6866
title: "Save your updated ConfigMap."

0 commit comments

Comments
 (0)