Skip to content

Commit 041cf02

Browse files
jeff-allen-mongojwilliams-mongo
authored andcommitted
Changes for ver 1.3.0 (#115)
* Changes for ver 1.3.0 Changes for ver 1.3.0 * updates from review * updates from review * updates per Jon's comments * Updates per review * Updates per review * Reordering settings
1 parent 135b423 commit 041cf02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+448
-280
lines changed

conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@
201201
'dl': ('http://www.mongodb.com/download-center/%s?jmp=docs',''),
202202
'website': ('https://www.mongodb.com%s?jmp=docs',''),
203203
'k8sdocs': ('https://kubernetes.io/docs%s', ''),
204+
'v1.2': ('https://docs.mongodb.com/kubernetes-operator/v1.2%s', ''),
204205
'gh' : ('https://github.com%s', '')
205206
}
206207

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Starting in |k8s-op-full| version 1.3.0, you can only have one MongoDB
2+
resource per project. This document explains how to migrate existing
3+
projects which have multiple MongoDB resources into configurations with
4+
a single resource per project.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Starting in |k8s-op-full| version 1.3.0, you can only have one MongoDB
2+
resource per project. To learn how to migrate your project to a
3+
single-cluster configuration, see :ref:`migrate-single-cluster`.

source/includes/important-unique-names-deployment-items.rst

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

source/includes/list-table-configmap-keys-x509.rst

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

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@
5252
Operator adds additional internal information to Projects
5353
that it creates.
5454

55+
If you omit the ``projectName``, the |k8s-op-short| creates
56+
a project with the same name as your |k8s| resource.
57+
5558
If you need or want to use an existing Project, you can find
5659
the ``projectName`` by clicking the :guilabel:`All Clusters`
5760
link at the top left of the screen, then either search by

source/includes/options-k8s-replica-set.yaml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@ inherit:
8787
name: spec.clusterName
8888
program: _shared
8989
file: options-k8s-shared.yaml
90-
91-
---
92-
program: k8sRsConf
93-
name: spec.project
94-
type: string
95-
directive: setting
96-
optional: false
97-
inherit:
98-
name: spec.project
99-
program: _shared
100-
file: options-k8s-shared.yaml
101-
10290
---
10391
program: k8sRsConf
10492
name: spec.credentials
@@ -323,23 +311,45 @@ inherit:
323311
file: options-k8s-shared.yaml
324312
---
325313
program: k8sRsConf
314+
name: spec.security.authentication.internalCluster
315+
inherit:
316+
name: spec.security.authentication.internalCluster
317+
program: _shared
318+
file: options-k8s-shared.yaml
319+
---
320+
program: k8sRsConf
321+
name: spec.security.authentication.enabled
322+
inherit:
323+
name: spec.security.authentication.enabled
324+
program: _shared
325+
file: options-k8s-shared.yaml
326+
---
327+
program: k8sRsConf
326328
name: spec.security.tls.enabled
327329
inherit:
328330
name: spec.security.tls.enabled
329331
program: _shared
330332
file: options-k8s-shared.yaml
331333
---
332334
program: k8sRsConf
335+
name: spec.security.authentication.modes
336+
inherit:
337+
name: spec.security.authentication.modes
338+
program: _shared
339+
file: options-k8s-shared.yaml
340+
---
341+
program: k8sRsConf
333342
name: spec.additionalMongodConfig.net.ssl.mode
334343
inherit:
335344
name: spec.additionalMongodConfig.net.ssl.mode
336345
program: _shared
337346
file: options-k8s-shared.yaml
338347
---
339348
program: k8sRsConf
340-
name: spec.security.clusterAuthenticationMode
349+
name: spec.security.authentication.internalCluster
341350
inherit:
342-
name: spec.security.clusterAuthenticationMode
351+
name: spec.security.authentication.internalCluster
343352
program: _shared
344353
file: options-k8s-shared.yaml
354+
345355
...

source/includes/options-k8s-shared.yaml

Lines changed: 52 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ description: |
108108
109109
---
110110
program: _shared
111-
name: spec.project
111+
name: spec.opsManager.configMapRef.name
112112
type: string
113113
directive: setting
114-
optional: false
115114
description: |
116-
*Required.* Name of the |k8s-configmap| with the |com| connection
117-
configuration.
115+
Name of the |k8s-configmap| with the |com| connection
116+
configuration. The :setting:`spec.cloudManager.configMapRef.name`
117+
setting is an alias for this setting and can be used in its place.
118118
119119
.. admonition:: Value must match namespace and name of ConfigMap
120120
:class: note
@@ -131,6 +131,22 @@ description: |
131131
132132
.. include:: /includes/k8s/fact-k8s-operator-manages-configmap.rst
133133
134+
*(Changed in version 1.3)*:
135+
136+
In prior versions of the |k8s-op|, this setting was
137+
``spec.project``. See the
138+
:v1.2:`v1.2 documentation
139+
</reference/k8s-operator-specification/#spec.project>`
140+
for information on the previous setting name.
141+
142+
---
143+
program: _shared
144+
name: spec.cloudManager.configMapRef.name
145+
type: string
146+
directive: setting
147+
optional: false
148+
description: |
149+
Alias for :setting:`spec.opsManager.configMapRef.name`.
134150
---
135151
program: _shared
136152
name: spec.credentials
@@ -481,6 +497,26 @@ description: |
481497
:setting:`spec.additionalMongodConfig.net.ssl.mode`.
482498
---
483499
program: _shared
500+
name: spec.security.authentication.modes
501+
type: array
502+
directive: setting
503+
optional: true
504+
description: |
505+
Set to ``["X509"]`` to enable
506+
:ref:`X.509 internal cluster authentication
507+
<x509-internal-authentication>` for the |com| project.
508+
---
509+
program: _shared
510+
name: spec.security.authentication.enabled
511+
type: boolean
512+
directive: setting
513+
optional: true
514+
default: "``false``"
515+
description: |
516+
Specifies whether x.509 authentication is enabled on the |com|
517+
project.
518+
---
519+
program: _shared
484520
name: spec.additionalMongodConfig.net.ssl.mode
485521
type: string
486522
directive: setting
@@ -491,25 +527,30 @@ description: |
491527
The following are valid options:
492528
493529
.. include:: /includes/list-table-requiressl-modes.rst
494-
495530
---
496531
program: _shared
497-
name: spec.security.clusterAuthenticationMode
532+
name: spec.security.authentication.internalCluster
498533
type: string
499534
directive: setting
500535
optional: true
501536
description: |
502-
503-
Set to ``x509`` to enable
504-
:ref:`X.509 internal cluster authentication <x509-internal-authentication>`.
505-
Requires |tls| on the resource by setting
506-
:setting:`spec.security.tls.enabled` to ``true``.
537+
Set to ``X509`` to enable :ref:`X.509 internal cluster authentication
538+
<x509-internal-authentication>`. Requires |tls| on the resource by
539+
setting :setting:`spec.security.tls.enabled` to ``true``.
507540
508541
.. important::
509542
510543
Once internal cluster authentication is enabled, it can not be
511544
disabled.
512545
546+
*(Changed in version 1.3)*:
547+
548+
In prior versions of the |k8s-op|, this setting was
549+
``spec.security.clusterAuthenticationMode``. See the
550+
:v1.2:`v1.2 documentation
551+
</reference/k8s-operator-specification/#spec.security.clusterAuthenticationMode>`
552+
for information on the previous setting name.
553+
513554
---
514555
program: _shared
515556
name: spec.exposedExternally

source/includes/options-k8s-shared_cluster.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,6 @@ inherit:
114114
name: spec.clusterName
115115
program: _shared
116116
file: options-k8s-shared.yaml
117-
118-
---
119-
program: k8sScConf
120-
name: spec.project
121-
type: string
122-
directive: setting
123-
optional: false
124-
inherit:
125-
name: spec.project
126-
program: _shared
127-
file: options-k8s-shared.yaml
128-
129117
---
130118
program: k8sScConf
131119
name: spec.credentials
@@ -638,4 +626,3 @@ inherit:
638626
file: options-k8s-shared.yaml
639627

640628
...
641-

source/includes/options-k8s-standalone.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,24 @@ inherit:
104104

105105
---
106106
program: k8sSaConf
107-
name: spec.project
107+
name: spec.opsManager.configMapRef.name
108108
type: string
109109
directive: setting
110110
optional: false
111111
inherit:
112-
name: spec.project
112+
name: spec.opsManager.configMapRef.name
113+
program: _shared
114+
file: options-k8s-shared.yaml
115+
---
116+
program: k8sSaConf
117+
name: spec.cloudManager.configMapRef.name
118+
type: string
119+
directive: setting
120+
optional: false
121+
inherit:
122+
name: spec.cloudManager.configMapRef.name
113123
program: _shared
114124
file: options-k8s-shared.yaml
115-
116125
---
117126
program: k8sSaConf
118127
name: spec.credentials

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,29 +48,37 @@ content: |
4848
The username must comply with the
4949
`RFC 2253 <https://tools.ietf.org/html/rfc2253>`__
5050
LDAPv3 Distinguished Name standard.
51-
51+
5252
To get the subject line of the X.509 certificate, run the
5353
following command:
5454
5555
.. code-block:: sh
5656
5757
openssl x509 -noout \
5858
-subject -in <my-cert.pem> \
59-
-nameopt RFC2253
59+
-nameopt RFC2253
6060
6161
- ``CN=mms-user,U=My Organizational Unit,O=My Org,L=New York,ST=New York,C=US``
6262
63-
* - ``spec.project``
63+
* - ``spec.opsManager.configMapRef.name``
6464
- string
6565
- The name of the project containing the MongoDB database
66-
where user will be added.
66+
where user will be added. The
67+
:setting:`spec.cloudManager.configMapRef.name` setting is an
68+
alias for this setting and can be used in its place.
6769
- ``my-project``
6870
6971
* - ``spec.roles.db``
7072
- string
7173
- The database the :ref:`role <roles>` can act on.
7274
- ``admin``
7375
76+
* - ``spec.mongodbResourceRef.name``
77+
- string
78+
- The name of the :ref:`MongoDB resource <deploy-resources>` to
79+
which this user is associated.
80+
- ``my-resource``
81+
7482
* - ``spec.roles.name``
7583
- string
7684
- The name of the :ref:`role <roles>` to grant the database

source/includes/steps-connect-to-x509-deployment.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ content: |
1818
spec:
1919
username: "CN=my-x509-authenticated-user, OU=organizationalunit, O=organization"
2020
db: "$external"
21-
project: my-project
21+
mongodbResourceRef:
22+
name: '<name of the MongoDB resource>'
2223
roles:
2324
- db: "admin"
2425
name: "clusterAdmin"
2526
2627
This ConfigMap ``.yaml`` file describes a ``MongoDBUser`` custom object. You
2728
can use these custom objects to create MongoDB users.
28-
29+
2930
In this example, the ConfigMap describes the user as an X.509
3031
user that the client can use to connect to MongoDB with the
3132
corresponding X.509 certificate.
@@ -77,7 +78,7 @@ content: |
7778
deployment using the mongo Shell:
7879
7980
.. tabs::
80-
81+
8182
.. tab:: MongoDB 4.2
8283
:tabid: mdb-4-2
8384

0 commit comments

Comments
 (0)