Skip to content

Commit e66fbe7

Browse files
authored
(DOCSP-32238) Name CA file ca-pem always (#1451)
* (DOCSP-32238) Name CA file ca-pem always * Made the necessary changes in all files that mention different tls.ca certs * Edits, capitalization, fixing minor inconsistencies
1 parent 5e54669 commit e66fbe7

9 files changed

+85
-60
lines changed

source/includes/options-k8s-shared.yaml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type: string
2323
directive: setting
2424
optional: false
2525
description: |
26-
Name of the |k8s-mdbrsc| you are creating.
26+
Name of the |k8s-mdbrsc| that you create.
2727
2828
.. include:: /includes/fact-resource-name-char-limit.rst
2929
@@ -34,8 +34,8 @@ type: string
3434
directive: setting
3535
optional: true
3636
description: |
37-
|k8s| |k8s-ns| where this |k8s-mdbrsc| and other
38-
|k8s-objs| are created.
37+
|k8s| |k8s-ns| where you create this |k8s-mdbrsc| and other
38+
|k8s-objs|.
3939
4040
---
4141
program: _shared
@@ -57,7 +57,7 @@ type: string
5757
directive: setting
5858
optional: false
5959
description: |
60-
Version of MongoDB that is installed on this |k8s-mdbrsc|.
60+
Version of MongoDB that you installed on this |k8s-mdbrsc|.
6161
6262
.. include:: /includes/admonitions/ubi-8-min-db-versions.rst
6363
@@ -657,7 +657,15 @@ type: string
657657
directive: setting
658658
optional: true
659659
description: |
660-
Provide the name of the |k8s-configmap| that stores the |certauth|.
660+
Provide the name of the |k8s-configmap| that stores the |certauth| for the |k8s-mdbrsc|.
661+
662+
.. important::
663+
664+
If you use a custom |certauth| to sign your |tls| certificates for the |k8s-mdbrsc|,
665+
you must specify this parameter.
666+
667+
The |k8s-op-short| requires that you name the
668+
|k8s-mdbrsc| certificate ``ca-pem`` in the ConfigMap.
661669
662670
---
663671
program: _shared
@@ -730,13 +738,13 @@ description: |
730738
.. important::
731739
732740
The |k8s-op-short| manages authentication for this MongoDB
733-
resource if you include this setting, even if it is set to
741+
resource if you include this setting, even if it's set to
734742
``false``. You can't configure authentication for this
735-
resource using the |com| user interface or APIs while this
736-
setting exists in the resource specification.
743+
resource using the |com| UI or APIs while this setting
744+
exists in the resource specification.
737745
738746
Omit this setting if you want to manage authentication using the
739-
|com| user interface or APIs.
747+
|com| UI or APIs.
740748
741749
---
742750
program: _shared
@@ -751,7 +759,7 @@ description: |
751759
|tls| certificate. Defaults to ``true`` if you enable |tls|
752760
authentication.
753761
754-
To enable |tls| authentication, provide a value
762+
To enable |tls| authentication, provide a value for the :setting:`spec.security.certsSecretPrefix` setting.
755763
756764
---
757765
program: _shared

source/includes/prereqs/custom-ca-prereqs-rs-tls-only.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
.. include:: /includes/prereqs/mdbagent-reqs.rst
2121

22-
- You must possess the |certauth| certificate and the key that you used to
23-
sign your |tls| certificates.
22+
- You must have the |certauth| certificate file and name it ``ca-pem``.
23+
- You must have the key that you used to sign your |tls| certificates.
2424

2525
.. include:: /includes/prereqs/pem-format.rst

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@ ref: validate-tls-cert
3939
content: |
4040
4141
If your |onprem| |tls| certificate or your application database
42-
|tls| certificate is signed by a Custom Certificate
43-
Authority, you must provide a :abbr:`CA (Certificate Authority)`
44-
certificate to validate the |tls| certificate(s). To validate the
45-
|tls| certificate(s), create a |k8s-configmap| to hold the
46-
:abbr:`CA (Certificate Authority)` certificate:
42+
|tls| certificate is signed by a custom |certauth|, you must provide a
43+
:abbr:`CA (Certificate Authority)` certificate to validate the |tls|
44+
certificate(s). To validate the |tls| certificate(s), create a
45+
|k8s-configmap| to hold the |certauth| certificate:
4746
4847
.. warning::
4948
@@ -211,13 +210,13 @@ content: |
211210
- string
212211
- Name of the |k8s-configmap| you created to verify your
213212
|onprem| |tls|
214-
certificates signed using a Custom Certificate Authority.
213+
certificates signed using a custom |certauth|.
215214
216215
.. important::
217216
218217
This field is required if you signed your
219218
|onprem| |tls|
220-
certificates using a Custom Certificate Authority.
219+
certificates using a custom |certauth|.
221220
222221
- ``om-http-cert-ca``
223222
@@ -314,13 +313,13 @@ content: |
314313
- string
315314
- Name of the |k8s-configmap| you created to verify your
316315
application database |tls|
317-
certificates signed using a Custom Certificate Authority.
316+
certificates signed using a custom |certauth|.
318317
319318
.. important::
320319
321320
This field is required if you signed your
322321
application database |tls|
323-
certificates using a Custom Certificate Authority.
322+
certificates using a custom |certauth|.
324323
325324
- ``ca``
326325
@@ -770,8 +769,8 @@ content: |
770769
- Set ``data.sslMMSCAConfigMap`` to the name of your
771770
|k8s-configmap| containing the root
772771
:abbr:`CA (Certificate Authority)` certificate used to sign the
773-
|onprem| host's certificate. The |k8s-op-short| requires this name to be
774-
``mms-ca.crt``.
772+
|onprem| host's certificate. The |k8s-op-short| requires that you name
773+
this |onprem| resource's certificate ``mms-ca.crt`` in the ConfigMap.
775774
776775
---
777776
title: "Deploy MongoDB database resources to complete the backup configuration."

source/includes/steps-multi-cluster-source.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,15 @@ ref: create-k8s-mc-tls-configmap
400400
title: "Create the ConfigMap to link your CA with your |mongodb-multi|."
401401
level: 4
402402
content: |
403-
Run the ``kubectl`` command to link your |certauth| to your |mongodb-multi|:
403+
Run the ``kubectl`` command to link your |certauth| to your |mongodb-multi|.
404+
Specify the |certauth| certificate file that you must always name
405+
``ca-pem`` for the |mongodb-multi|:
404406
405407
.. code-block:: sh
406408
407409
kubectl --context $MDB_CENTRAL_CLUSTER_FULL_NAME \
408410
--namespace=<metadata.namespace> \
409-
create configmap custom-ca -from-file=ca-pem
411+
create configmap custom-ca -from-file=ca-pem=<your-custom-ca-file>
410412
411413
---
412414
stepnum: 0

source/includes/steps-source-configmap-secure.yaml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: "Create a ConfigMap for the Certificate Authority certificate."
2+
title: "Create a ConfigMap for the certificate authority (CA) certificate."
33
stepnum: 1
44
level: 4
55
ref: create-configmap-ca
66
content: |
77
The |k8s-op-short| requires the root |certauth| certificate of the
8-
Certificate Authority that issued the |mms| host's certificate. Run
9-
the following command to create a |k8s-configmap| containing the root
10-
CA certificate in the same namespace of your database pods:
8+
|certauth| that issued the |mms| host's certificate. Run the following
9+
command to create a |k8s-configmap| containing the root |certauth| in the
10+
same namespace of your database Pods:
1111
1212
.. code-block:: sh
1313
@@ -16,8 +16,8 @@ content: |
1616
1717
.. important::
1818
19-
The |k8s-op-short| requires that the certificate is named
20-
``mms-ca.crt`` in the ConfigMap.
19+
The |k8s-op-short| requires that you name the |onprem| resource's
20+
certificate ``mms-ca.crt`` in the ConfigMap.
2121
---
2222
title: "Copy the following example ConfigMap."
2323
stepnum: 0
@@ -101,10 +101,10 @@ content: |
101101
102102
kubectl describe configmaps <myconfigmap> -n <metadata.namespace>
103103
104-
.. admonition:: *Always include the namespace option with* ``kubectl``
105-
:class: important
104+
.. important::
106105
107-
|kubectl| defaults to an empty namespace if you do not specify the
106+
Always include the namespace option with ``kubectl``.
107+
|kubectl| defaults to an empty namespace if you don't specify the
108108
``-n`` option, resulting in deployment failures. You must specify
109109
the value of the ``<metadata.namespace>`` field. The
110110
|k8s-op-short|, |k8s-secret|, and |k8s-mdbrsc|\s should run in the
@@ -129,11 +129,12 @@ content: |
129129
130130
kubectl describe configmaps <my-configmap> -n <metadata.namespace>
131131
132-
.. admonition:: *Always include the namespace option with* ``kubectl``
133-
:class: important
132+
.. important::
134133
135-
|kubectl| defaults to an empty namespace if you do not specify the
136-
``-n`` option, resulting in deployment failures. The
134+
Always include the namespace option with ``kubectl``.
135+
|kubectl| defaults to an empty namespace if you don't specify the
136+
``-n`` option, resulting in deployment failures. You must specify
137+
the value of the ``<metadata.namespace>`` field. The
137138
|k8s-op-short|, |k8s-secret|, and |k8s-mdbrsc|\s should run in the
138139
same unique namespace.
139140

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
2-
title: "Create a ConfigMap for the Certificate Authority certificate."
2+
title: "Create a ConfigMap for the certificate authority (CA) certificate."
33
stepnum: 0
44
level: 4
55
ref: create-configmap-ca
66
content: |
77
The |k8s-op-short| requires the root |certauth| certificate of the
8-
Certificate Authority that issued the |mms| host's certificate. Run
8+
custom |certauth| that issued the |mms| host's certificate. Run
99
the following command to create a |k8s-configmap| containing the root
10-
CA certificate in the same namespace of your database pods:
10+
|certauth| certificate in the same namespace of your database pods:
1111
1212
.. code-block:: sh
1313
@@ -16,8 +16,8 @@ content: |
1616
1717
.. important::
1818
19-
The |k8s-op-short| requires that the certificate is named
20-
``mms-ca.crt`` in the ConfigMap.
19+
The |k8s-op-short| requires that you name the |onprem| resource's
20+
certificate ``mms-ca.crt`` in the ConfigMap.
2121
2222
---
2323
title: "Copy the following example ``ConfigMap``."
@@ -94,7 +94,7 @@ content: |
9494
.. include:: /includes/list-tables/rs-resource-base-options.rst
9595
9696
---
97-
title: "Configure the TLS settings for your {{k8sResource}} resource using a Custom Certificate Authority."
97+
title: "Configure the TLS settings for your {{k8sResource}} resource using a custom certificate authority (CA)."
9898
stepnum: 0
9999
level: 4
100100
ref: add-tls-settings-custom-ca
@@ -655,11 +655,16 @@ ref: create-rs-tls-configmap
655655
content: |
656656
657657
Run this ``kubectl`` command to link your |certauth| to your replica
658-
set:
658+
set and specify the |certauth| certificate file.
659+
660+
.. important::
661+
662+
The |k8s-op-short| requires that the certificate for the |k8s-mdbrsc|
663+
is named ``ca-pem`` in the ConfigMap.
659664
660665
.. code-block:: sh
661666
662-
kubectl create configmap custom-ca --from-file=ca-pem
667+
kubectl create configmap custom-ca --from-file=ca-pem=<your-custom-ca-file>
663668
664669
---
665670
title: "Create the secret for your Shards' TLS certificates."
@@ -906,11 +911,12 @@ ref: create-sc-tls-configmap
906911
content: |
907912
908913
Run this ``kubectl`` command to link your |certauth| to your sharded
909-
cluster:
914+
cluster and specify the |certauth| certificate file that you must always
915+
name ``ca-pem`` for the |k8s-mdbrsc|:
910916
911917
.. code-block:: sh
912918
913-
kubectl create configmap custom-ca --from-file=ca-pem
919+
kubectl create configmap custom-ca --from-file=ca-pem=<your-custom-ca-file>
914920
915921
---
916922
title: "Test the connection to the replica set."

source/includes/steps-source-deploy-om-resource.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ content: |
2222
stepnum: 0
2323
level: 4
2424
ref: create-om-appdb-configmap
25-
title: "Create a ConfigMap that contains the Certificate Authority."
25+
title: "Create a ConfigMap that contains the certificate authority (CA)."
2626
optional: true
2727
content: |
2828

source/reference/k8s-operator-multi-cluster-specification.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,8 @@ Optional ``MongoDBMultiCluster`` Resource Settings
10421042
|tls| certificate. Defaults to ``true`` if you enable |tls|
10431043
authentication.
10441044

1045-
To enable |tls| authentication, provide a value.
1045+
To enable |tls| authentication, provide a value for the
1046+
:ref:`spec.security.certsSecretPrefix <multi-spec-security-certssecretprefix>` setting.
10461047

10471048
.. _multi-spec-security-certssecretprefix:
10481049

@@ -1248,6 +1249,14 @@ Optional ``MongoDBMultiCluster`` Resource Settings
12481249

12491250
Provide the name of the |k8s-configmap| that stores the |certauth|.
12501251

1252+
.. important::
1253+
1254+
If you use a custom |certauth| to sign your |tls| certificates for
1255+
the |mongodb-multi|, you must specify this parameter.
1256+
1257+
The |k8s-op-short| requires that you name the certificate for the
1258+
|mongodb-multi| ``ca-pem`` in the ConfigMap.
1259+
12511260
.. _multi-spec-security-tls-enabled:
12521261

12531262
``spec.security.tls.enabled``

source/reference/k8s-operator-om-specification.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ Optional |onprem| Resource Settings
265265
.. important::
266266

267267
:opsmgrkube:`spec.applicationDatabase.security.tls.ca` is required
268-
if you use a Custom Certificate Authority to sign your application
269-
database |tls| certificates.
268+
if you use a custom |certauth| to sign your application database's
269+
|tls| certificates.
270270

271-
The |k8s-op-short| requires that the certificate is named
272-
``ca-pem`` in the ConfigMap.
271+
The |k8s-op-short| requires that you name the application database's
272+
certificate ``ca-pem`` in the ConfigMap.
273273

274274
The |certauth| specified in this section is also used for
275275
configuring custom |tls| certificates for |s3| storage when either
@@ -956,11 +956,11 @@ Optional |onprem| Resource Settings
956956

957957
.. important::
958958

959-
:opsmgrkube:`spec.security.tls.ca` is required if you use a Custom
960-
Certificate Authority to sign your |onprem| |tls| certificates.
959+
:opsmgrkube:`spec.security.tls.ca` is required if you use a custom
960+
|certauth| to sign your |onprem| |tls| certificates.
961961

962-
The |k8s-op-short| requires that the certificate is named
963-
``mms-ca.crt`` in the ConfigMap.
962+
The |k8s-op-short| requires that you name the certificate
963+
for the |onprem| resource ``mms-ca.crt`` in the ConfigMap.
964964

965965
This |certauth| signs the certificates that:
966966

@@ -1507,7 +1507,7 @@ You can use |tls| for both |s3| and your application database, or for
15071507
:opsmgrkube:`spec.backup.s3Stores.customCertificateSecretRefs`
15081508
instead.
15091509

1510-
Flag that indicates whether you use AppDB certificates
1510+
Flag that indicates whether you use Application Database's certificates
15111511
(``appdb-ca``) as the custom |tls| certificate for your |s3| backups.
15121512
The default is ``False``.
15131513

@@ -1525,7 +1525,7 @@ You can use |tls| for both |s3| and your application database, or for
15251525
also provide the :opsmgrkube:`spec.backup.s3Stores.customCertificate`
15261526
setting, |k8s-op-short| uses the
15271527
:opsmgrkube:`spec.applicationDatabase.security.tls.ca` as the
1528-
custom certificate for backups.
1528+
custom certificate for backups.
15291529

15301530
Each entry in the list specifies the
15311531
:opsmgrkube:`~spec.backup.s3Stores.customCertificateSecretRefs.name`

0 commit comments

Comments
 (0)