From d4acfc9aeecd7d6353e11e8b84e5bf8edaadca3c Mon Sep 17 00:00:00 2001 From: Christoph Geschwind Date: Fri, 10 Jan 2025 11:54:56 +0100 Subject: [PATCH] Implement OverrideReplicaSet Id for https://github.com/mongodb/mongodb-kubernetes-operator/issues/1650 --- api/v1/mongodbcommunity_types.go | 3 +++ api/v1/zz_generated.deepcopy.go | 5 +++++ ...bcommunity.mongodb.com_mongodbcommunity.yaml | 5 +++++ controllers/replica_set_controller.go | 3 +++ .../automation_config_builder.go | 13 ++++++++++++- pkg/automationconfig/automation_config_test.go | 17 +++++++++++++++++ 6 files changed, 45 insertions(+), 1 deletion(-) diff --git a/api/v1/mongodbcommunity_types.go b/api/v1/mongodbcommunity_types.go index f1e7f8710..6246eeb61 100644 --- a/api/v1/mongodbcommunity_types.go +++ b/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"` diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index bf58f2b77..df22b4876 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -366,6 +366,11 @@ func (in *OverrideProcess) DeepCopy() *OverrideProcess { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OverrideReplicaSet) DeepCopyInto(out *OverrideReplicaSet) { *out = *in + if in.Id != nil { + in, out := &in.Id, &out.Id + *out = new(string) + **out = **in + } in.Settings.DeepCopyInto(&out.Settings) } diff --git a/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml b/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml index e7c3faa69..d16ecad90 100644 --- a/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml +++ b/config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml @@ -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. diff --git a/controllers/replica_set_controller.go b/controllers/replica_set_controller.go index e956790ba..ec54d1ec7 100644 --- a/controllers/replica_set_controller.go +++ b/controllers/replica_set_controller.go @@ -512,8 +512,10 @@ func buildAutomationConfig(mdb mdbv1.MongoDBCommunity, auth automationconfig.Aut } 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(). @@ -530,6 +532,7 @@ func buildAutomationConfig(mdb mdbv1.MongoDBCommunity, auth automationconfig.Aut 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()). diff --git a/pkg/automationconfig/automation_config_builder.go b/pkg/automationconfig/automation_config_builder.go index be69e3f29..3091734dc 100644 --- a/pkg/automationconfig/automation_config_builder.go +++ b/pkg/automationconfig/automation_config_builder.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, diff --git a/pkg/automationconfig/automation_config_test.go b/pkg/automationconfig/automation_config_test.go index 2950eb4d7..19b3bcfe8 100644 --- a/pkg/automationconfig/automation_config_test.go +++ b/pkg/automationconfig/automation_config_test.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") +}