Implement OverrideReplicaSet Id for #1650 (#1656)

Author: 1st8

api/v1/mongodbcommunity_types.go

@@ -328,6 +328,9 @@ type AutomationConfigOverride struct {
 }
 
 type OverrideReplicaSet struct {
+	// Id can be used together with additionalMongodConfig.replication.replSetName
+	// to manage clusters where replSetName differs from the MongoDBCommunity resource name
+	Id *string `json:"id,omitempty"`
 	// +kubebuilder:validation:Type=object
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Settings MapWrapper `json:"settings,omitempty"`

api/v1/zz_generated.deepcopy.go

@@ -225,6 +225,11 @@ spec:
                     type: array
                   replicaSet:
                     properties:
+                      id:
+                        description: |-
+                          Id can be used together with additionalMongodConfig.replication.replSetName
+                          to manage clusters where replSetName differs from the MongoDBCommunity resource name
+                        type: string
                       settings:
                         description: |-
                           MapWrapper is a wrapper for a map to be used by other structs.

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

@@ -527,8 +527,10 @@ func buildAutomationConfig(mdb mdbv1.MongoDBCommunity, isEnterprise bool, auth a
 	}
 
 	var acOverrideSettings map[string]interface{}
+	var acReplicaSetId *string
 	if mdb.Spec.AutomationConfigOverride != nil {
 		acOverrideSettings = mdb.Spec.AutomationConfigOverride.ReplicaSet.Settings.Object
+		acReplicaSetId = mdb.Spec.AutomationConfigOverride.ReplicaSet.Id
 	}
 
 	return automationconfig.NewBuilder().
@@ -545,6 +547,7 @@ func buildAutomationConfig(mdb mdbv1.MongoDBCommunity, isEnterprise bool, auth a
 		SetFCV(mdb.Spec.FeatureCompatibilityVersion).
 		SetOptions(automationconfig.Options{DownloadBase: "/var/lib/mongodb-mms-automation"}).
 		SetAuth(auth).
+		SetReplicaSetId(acReplicaSetId).
 		SetSettings(acOverrideSettings).
 		SetMemberOptions(mdb.Spec.MemberConfig).
 		SetDataDir(mdb.GetMongodConfiguration().GetDBDataDir()).

controllers/replica_set_controller.go

@@ -54,6 +54,7 @@ type Builder struct {
 	port                      int
 	memberOptions             []MemberOptions
 	forceReconfigureToVersion *int64
+	replicaSetId              *string
 	settings                  map[string]interface{}
 }
 
@@ -194,6 +195,11 @@ func (b *Builder) SetAuth(auth Auth) *Builder {
 	return b
 }
 
+func (b *Builder) SetReplicaSetId(id *string) *Builder {
+	b.replicaSetId = id
+	return b
+}
+
 func (b *Builder) SetSettings(settings map[string]interface{}) *Builder {
 	b.settings = settings
 	return b
@@ -372,12 +378,17 @@ func (b *Builder) Build() (AutomationConfig, error) {
 		replSetForceConfig = &ReplSetForceConfig{CurrentVersion: *b.forceReconfigureToVersion}
 	}
 
+	replicaSetId := b.name
+	if b.replicaSetId != nil {
+		replicaSetId = *b.replicaSetId
+	}
+
 	currentAc := AutomationConfig{
 		Version:   b.previousAC.Version,
 		Processes: processes,
 		ReplicaSets: []ReplicaSet{
 			{
-				Id:              b.name,
+				Id:              replicaSetId,
 				Members:         members,
 				ProtocolVersion: "1",
 				NumberArbiters:  b.arbiters,

pkg/automationconfig/automation_config_builder.go

@@ -530,3 +530,20 @@ func createAutomationConfig(name, mongodbVersion, domain string, opts Options, a
 	ac.Version = acVersion
 	return ac
 }
+
+func TestReplicaSetId(t *testing.T) {
+	id := "rs0"
+	ac, err := NewBuilder().
+		SetName("my-rs").
+		SetDomain("my-ns.svc.cluster.local").
+		SetMongoDBVersion("4.2.0").
+		SetMembers(3).
+		AddVersion(defaultMongoDbVersion("4.3.2")).
+		SetReplicaSetId(&id).
+		Build()
+
+	assert.NoError(t, err)
+	assert.Len(t, ac.ReplicaSets, 1)
+	rs := ac.ReplicaSets[0]
+	assert.Equal(t, rs.Id, id, "The provided id should be used")
+}