Skip to content

Commit 98195f3

Browse files
authored
(DOCSP-33941): Fix incorrect spec.memberConfig settings (#1496)
* Fix spec.memberConfig setting * copy review feedback * tech review feedback
1 parent 20497d6 commit 98195f3

File tree

4 files changed

+109
-13
lines changed

4 files changed

+109
-13
lines changed

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

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -832,7 +832,46 @@ inherit:
832832

833833
---
834834
program: k8sRsConf
835-
name: spec.clusterSpecList.memberConfig.priority
835+
name: spec.memberConfig
836+
type: collection
837+
directive: setting
838+
optional: true
839+
description: |
840+
Specification for each MongoDB replica set member deployed from
841+
the |k8s-mdbrsc|.
842+
843+
The order of the elements in the array must reflect the order of members
844+
in the replica set. For example, the first element of the array affects
845+
the Pod at index ``0``, the second element affects index ``1``, and so on.
846+
847+
.. example::
848+
849+
Consider the following example specification for a
850+
three-member replica set:
851+
852+
.. code-block:: yaml
853+
854+
spec:
855+
memberConfig:
856+
- votes: 1
857+
priority: "0.5"
858+
tags:
859+
tag1: "value1"
860+
environment: "prod"
861+
- votes: 1
862+
priority: "1.5"
863+
tags:
864+
tag2: "value2"
865+
environment: "prod"
866+
- votes: 0
867+
priority: "0.5"
868+
tags:
869+
tag2: "value2"
870+
environment: "prod"
871+
872+
---
873+
program: k8sRsConf
874+
name: spec.memberConfig.priority
836875
type: string
837876
directive: setting
838877
optional: true
@@ -849,7 +888,7 @@ description: |
849888
850889
---
851890
program: k8sRsConf
852-
name: spec.clusterSpecList.memberConfig.tags
891+
name: spec.memberConfig.tags
853892
type: map
854893
directive: setting
855894
optional: true
@@ -859,7 +898,7 @@ description: |
859898
860899
---
861900
program: k8sRsConf
862-
name: spec.clusterSpecList.memberConfig.votes
901+
name: spec.memberConfig.votes
863902
type: number
864903
directive: setting
865904
optional: true

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

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,66 @@ Optional ``MongoDBMultiCluster`` Resource Settings
429429
.. _multi-spec-clusterspeclist-memberconfig:
430430

431431
``spec.clusterSpecList.memberConfig``
432-
*Type*: collection
432+
*Type*: collection
433433

434-
Specification for the MongoDB replica set members in your |multi-cluster|.
434+
Specification for each MongoDB replica set and its
435+
members in your |multi-cluster|.
435436

437+
The order of the elements in the object for each replica set
438+
must reflect the order of members in the replica set. For example,
439+
the first element affects the Pod at index ``0``, the second
440+
element affects index ``1``, and so on.
441+
442+
.. example::
443+
444+
Consider the following example specification for a
445+
|multi-cluster| with three replica sets:
446+
447+
.. code-block:: yaml
448+
449+
apiVersion: mongodb.com/v1
450+
kind: MongoDBMultiCluster
451+
metadata:
452+
name: multi-replica-set
453+
spec:
454+
version: 4.4.0-ent
455+
type: ReplicaSet
456+
duplicateServiceObjects: false
457+
credentials: my-credentials
458+
opsManager:
459+
configMapRef:
460+
name: my-project
461+
clusterSpecList:
462+
- clusterName: cluster1.example.com
463+
members: 2
464+
memberConfig:
465+
- votes: 1
466+
priority: "0.5"
467+
tags:
468+
tag1: "value1"
469+
environment: "prod"
470+
- votes: 1
471+
priority: "1.5"
472+
tags:
473+
tag2: "value2"
474+
environment: "prod"
475+
- clusterName: cluster2.example.com
476+
members: 1
477+
memberConfig:
478+
- votes: 1
479+
priority: "0.5"
480+
tags:
481+
tag1: "value1"
482+
environment: "prod"
483+
- clusterName: cluster3.example.com
484+
members: 1
485+
memberConfig:
486+
- votes: 1
487+
priority: "0.5"
488+
tags:
489+
tag1: "value1"
490+
environment: "prod"
491+
436492
.. _multi-spec-clusterspeclist-memberconfig-priority:
437493

438494
``spec.clusterSpecList.memberConfig.priority``

source/reference/k8s-operator-specification.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,10 @@ The following settings apply only to replica set resource types:
204204

205205
.. include:: /includes/option/setting-k8sSaConf-spec.featureCompatibilityVersion.rst
206206
.. include:: /includes/option/setting-k8sRsConf-spec.members.rst
207-
.. include:: /includes/option/setting-k8sRsConf-spec.clusterSpecList.memberConfig.priority.rst
208-
.. include:: /includes/option/setting-k8sRsConf-spec.clusterSpecList.memberConfig.tags.rst
209-
.. include:: /includes/option/setting-k8sRsConf-spec.clusterSpecList.memberConfig.votes.rst
207+
.. include:: /includes/option/setting-k8sRsConf-spec.memberConfig.rst
208+
.. include:: /includes/option/setting-k8sRsConf-spec.memberConfig.priority.rst
209+
.. include:: /includes/option/setting-k8sRsConf-spec.memberConfig.tags.rst
210+
.. include:: /includes/option/setting-k8sRsConf-spec.memberConfig.votes.rst
210211
.. include:: /includes/option/setting-k8sRsConf-spec.podSpec.podAntiAffinityTopologyKey.rst
211212

212213

source/release-notes.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,10 @@ MongoDBMultiCluster Resource
380380
settings to configure external connectivity settings for |mongodb-multis|. Use these settings to
381381
:ref:`connect to a Multi-Cluster Resource from outside Kubernetes <multi-cluster-connect-from-outside-k8s>`.
382382

383-
- Adds the :ref:`spec.memberOptions.memberConfig.votes <multi-spec-clusterspeclist-memberconfig-votes>`
384-
and :ref:`spec.memberOptions.memberConfig.priority <multi-spec-clusterspeclist-memberconfig-priority>`
383+
- Adds the :ref:`spec.clusterSpecList.memberConfig.votes <multi-spec-clusterspeclist-memberconfig-votes>`
384+
and :ref:`spec.clusterSpecList.memberConfig.priority <multi-spec-clusterspeclist-memberconfig-priority>`
385385
settings for configuring replica set member votes and member priority for |mongodb-multis|.
386-
- Adds the :ref:`spec.memberOptions.memberConfig.tags <multi-spec-clusterspeclist-memberconfig-tags>`
386+
- Adds the :ref:`spec.clusterSpecList.memberConfig.tags <multi-spec-clusterspeclist-memberconfig-tags>`
387387
setting for adding tags to replica set members in |mongodb-multis|.
388388

389389
- Adds the :ref:`spec.security.authentication.ldap.timeoutMS <multi-spec-security-ldap-timeoutms>`
@@ -393,9 +393,9 @@ MongoDBMultiCluster Resource
393393
MongoDB Resource
394394
`````````````````
395395

396-
- Adds the :setting:`spec.memberOptions.memberConfig.votes` and :setting:`spec.memberOptions.memberConfig.priority`
396+
- Adds the :setting:`spec.memberConfig.votes` and :setting:`spec.memberConfig.priority`
397397
settings for configuring replica set member votes and member priority.
398-
- Adds the :setting:`spec.memberOptions.memberConfig.tags` setting for adding tags
398+
- Adds the :setting:`spec.memberConfig.tags` setting for adding tags
399399
to replica set members.
400400
- Adds the :setting:`spec.podSpec.podAffinity` setting to determine whether
401401
multiple |k8s-mdbrsc| |k8s-pods| must be co-located with other

0 commit comments

Comments
 (0)