Configure vote / tag / priority

api/v1/mongodbcommunity_types.go

@@ -128,6 +128,10 @@ type MongoDBCommunitySpec struct {
 	// +kubebuilder:pruning:PreserveUnknownFields
 	// +nullable
 	AdditionalConnectionStringConfig MapWrapper `json:"additionalConnectionStringConfig,omitempty"`
+
+	// MemberConfig
+	// +optional
+	MemberConfig []automationconfig.MemberOptions `json:"memberConfig,omitempty"`
 }
 
 // MapWrapper is a wrapper for a map to be used by other structs.

config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml

@@ -1,4 +1,3 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -188,6 +187,20 @@ spec:
                 description: FeatureCompatibilityVersion configures the feature compatibility
                   version that will be set for the deployment
                 type: string
+              memberConfig:
+                description: MemberConfig
+                items:
+                  properties:
+                    priority:
+                      type: string
+                    tags:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    votes:
+                      type: integer
+                  type: object
+                type: array
               members:
                 description: Members is the number of members in the replica set
                 type: integer

controllers/replica_set_controller.go

@@ -553,6 +553,7 @@ func buildAutomationConfig(mdb mdbv1.MongoDBCommunity, auth automationconfig.Aut
 		SetFCV(mdb.Spec.FeatureCompatibilityVersion).
 		SetOptions(automationconfig.Options{DownloadBase: "/var/lib/mongodb-mms-automation"}).
 		SetAuth(auth).
+		SetMemberOptions(mdb.Spec.MemberConfig).
 		SetDataDir(mdb.GetMongodConfiguration().GetDBDataDir()).
 		AddModifications(getMongodConfigModification(mdb)).
 		AddModifications(modifications...).

test/e2e/mongodbtests/mongodbtests.go

@@ -4,11 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/mongodb/mongodb-kubernetes-operator/pkg/authentication/authtypes"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/mongodb/mongodb-kubernetes-operator/pkg/authentication/authtypes"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/mongodb/mongodb-kubernetes-operator/pkg/kube/container"
@@ -34,6 +36,11 @@ func SkipTestIfLocal(t *testing.T, msg string, f func(t *testing.T)) {
 	t.Run(msg, f)
 }
 
+func strPointer(n float32) *string {
+	s := strconv.FormatFloat(float64(n), 'f', -1, 64)
+	return &s
+}
+
 // StatefulSetBecomesReady ensures that the underlying stateful set
 // reaches the running state.
 func StatefulSetBecomesReady(mdb *mdbv1.MongoDBCommunity, opts ...wait.Configuration) func(t *testing.T) {
@@ -416,6 +423,20 @@ func AutomationConfigHasTheExpectedCustomRoles(mdb *mdbv1.MongoDBCommunity, role
 	}
 }
 
+func AutomationConfigHasVoteTagPriorityConfigured(mdb *mdbv1.MongoDBCommunity, memberOptions []automationconfig.MemberOptions) func(t *testing.T) {
+	acMemberOptions := make([]automationconfig.MemberOptions, 0)
+
+	return func(t *testing.T) {
+		currentAc := getAutomationConfig(t, mdb)
+		rsMemebers := currentAc.ReplicaSets
+
+		for _, m := range rsMemebers[0].Members {
+			acMemberOptions = append(acMemberOptions, automationconfig.MemberOptions{Votes: m.Votes, Priority: strPointer(m.Priority), Tags: m.Tags})
+		}
+		assert.ElementsMatch(t, memberOptions, acMemberOptions)
+	}
+}
+
 // CreateMongoDBResource creates the MongoDB resource
 func CreateMongoDBResource(mdb *mdbv1.MongoDBCommunity, ctx *e2eutil.Context) func(*testing.T) {
 	return func(t *testing.T) {

test/e2e/replica_set/replica_set_test.go

@@ -20,6 +20,9 @@ func TestMain(m *testing.M) {
 	os.Exit(code)
 }
 
+func intPtr(x int) *int       { return &x }
+func strPtr(s string) *string { return &s }
+
 func TestReplicaSet(t *testing.T) {
 	ctx := setup.Setup(t)
 	defer ctx.Teardown()
@@ -54,6 +57,26 @@ func TestReplicaSet(t *testing.T) {
 	mdb.Spec.AgentConfiguration.LogRotate = &lcr
 	mdb.Spec.AgentConfiguration.SystemLog = &systemLog
 
+	// config member options
+	memberOptions := []automationconfig.MemberOptions{
+		{
+			Votes:    intPtr(1),
+			Tags:     map[string]string{"foo1": "bar1"},
+			Priority: strPtr("1.5"),
+		},
+		{
+			Votes:    intPtr(1),
+			Tags:     map[string]string{"foo2": "bar2"},
+			Priority: strPtr("1"),
+		},
+		{
+			Votes:    intPtr(1),
+			Tags:     map[string]string{"foo3": "bar3"},
+			Priority: strPtr("2.5"),
+		},
+	}
+	mdb.Spec.MemberConfig = memberOptions
+
 	tester, err := FromResource(t, mdb)
 	if err != nil {
 		t.Fatal(err)
@@ -71,4 +94,5 @@ func TestReplicaSet(t *testing.T) {
 		tester.ConnectivitySucceeds(WithURI(mongodbtests.GetSrvConnectionStringForUser(mdb, scramUser))))
 	t.Run("Ensure Authentication", tester.EnsureAuthenticationIsConfigured(3))
 	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(&mdb, 1))
+	t.Run("AutomationCondig has correct member options", mongodbtests.AutomationConfigHasVoteTagPriorityConfigured(&mdb, memberOptions))
 }