CLOUDP-59502: Configure FCV (#30)

Author: chatton

deploy/crds/mongodb.com_mongodbs_crd.yaml

@@ -31,6 +31,10 @@ spec:
         spec:
           description: MongoDBSpec defines the desired state of MongoDB
           properties:
+            featureCompatibilityVersion:
+              description: FeatureCompatibilityVersion configures the feature compatibility
+                version that will be set for the deployment
+              type: string
             members:
               description: Members is the number of members in the replica set
               type: integer

pkg/apis/mongodb/v1/mongodb_types.go

@@ -24,6 +24,11 @@ type MongoDBSpec struct {
 	Type Type `json:"type"`
 	// Version defines which version of MongoDB will be used
 	Version string `json:"version"`
+
+	// FeatureCompatibilityVersion configures the feature compatibility version that will
+	// be set for the deployment
+	// +optional
+	FeatureCompatibilityVersion string `json:"featureCompatibilityVersion,omitempty"`
 }
 
 // MongoDBStatus defines the observed state of MongoDB
@@ -55,14 +60,26 @@ func (m MongoDB) MongoURI() string {
 
 // ServiceName returns the name of the Service that should be created for
 // this resource
-func (m *MongoDB) ServiceName() string {
+func (m MongoDB) ServiceName() string {
 	return m.Name + "-svc"
 }
 
-func (m *MongoDB) ConfigMapName() string {
+func (m MongoDB) ConfigMapName() string {
 	return m.Name + "-config"
 }
 
+// GetFCV returns the feature compatibility version. If no FeatureCompatibilityVersion is specified.
+// It uses the major and minor version for whichever version of MongoDB is configured.
+func (m MongoDB) GetFCV() string {
+	versionToSplit := m.Spec.FeatureCompatibilityVersion
+	if versionToSplit == "" {
+		versionToSplit = m.Spec.Version
+	}
+	minorIndex := 1
+	parts := strings.Split(versionToSplit, ".")
+	return strings.Join(parts[:minorIndex+1], ".")
+}
+
 // TODO: build the correct statefulset - this is a dummy implementation
 // BuildStatefulSet constructs an instance of appsv1.StatefulSet
 // which should be created during reconciliation

pkg/apis/mongodb/v1/mongodb_types_test.go

@@ -16,6 +16,18 @@ func TestMongoDB_MongoURI(t *testing.T) {
 	assert.Equal(t, mdb.MongoURI(), "mongodb://my-big-rs-0.my-big-rs-svc.my-big-namespace.svc.cluster.local:27017,my-big-rs-1.my-big-rs-svc.my-big-namespace.svc.cluster.local:27017,my-big-rs-2.my-big-rs-svc.my-big-namespace.svc.cluster.local:27017,my-big-rs-3.my-big-rs-svc.my-big-namespace.svc.cluster.local:27017,my-big-rs-4.my-big-rs-svc.my-big-namespace.svc.cluster.local:27017")
 }
 
+func TestGetFCV(t *testing.T) {
+	mdb := newReplicaSet(3, "my-rs", "my-ns")
+	mdb.Spec.Version = "4.2.0"
+	assert.Equal(t, "4.2", mdb.GetFCV())
+
+	mdb.Spec.FeatureCompatibilityVersion = "4.0"
+	assert.Equal(t, "4.0", mdb.GetFCV())
+
+	mdb.Spec.FeatureCompatibilityVersion = ""
+	assert.Equal(t, "4.2", mdb.GetFCV())
+}
+
 func newReplicaSet(members int, name, namespace string) MongoDB {
 	return MongoDB{
 		TypeMeta: metav1.TypeMeta{},

pkg/automationconfig/automation_config.go

@@ -68,8 +68,8 @@ type SystemLog struct {
 	Path        string `json:"path"`
 }
 
-func newProcess(name, hostName, version, replSetName string) Process {
-	return Process{
+func newProcess(name, hostName, version, replSetName string, opts ...func(process *Process)) Process {
+	p := Process{
 		Name:                        name,
 		HostName:                    hostName,
 		FeatureCompatibilityVersion: "4.0",
@@ -90,6 +90,12 @@ func newProcess(name, hostName, version, replSetName string) Process {
 			Replication: Replication{ReplicaSetName: replSetName},
 		},
 	}
+
+	for _, opt := range opts {
+		opt(&p)
+	}
+
+	return p
 }
 
 type Replication struct {

pkg/automationconfig/automation_config_builder.go

@@ -18,6 +18,7 @@ type Builder struct {
 	members        int
 	domain         string
 	name           string
+	fcv            string
 	topology       Topology
 	mongodbVersion string
 
@@ -53,6 +54,11 @@ func (b *Builder) SetName(name string) *Builder {
 	return b
 }
 
+func (b *Builder) SetFCV(fcv string) *Builder {
+	b.fcv = fcv
+	return b
+}
+
 func (b *Builder) AddVersion(version MongoDbVersionConfig) *Builder {
 	for idx, _ := range version.Builds {
 		if version.Builds[idx].Modules == nil {
@@ -82,7 +88,7 @@ func (b *Builder) Build() AutomationConfig {
 	members := make([]ReplicaSetMember, b.members)
 	processes := make([]Process, b.members)
 	for i, h := range hostnames {
-		process := newProcess(toHostName(b.name, i), h, b.mongodbVersion, b.name)
+		process := newProcess(toHostName(b.name, i), h, b.mongodbVersion, b.name, withFCV(b.fcv))
 		processes[i] = process
 		members[i] = newReplicaSetMember(process, i)
 	}
@@ -106,3 +112,10 @@ func (b *Builder) Build() AutomationConfig {
 func toHostName(name string, index int) string {
 	return fmt.Sprintf("%s-%d", name, index)
 }
+
+// Process functional options
+func withFCV(fcv string) func(*Process) {
+	return func(process *Process) {
+		process.FeatureCompatibilityVersion = fcv
+	}
+}

pkg/automationconfig/automation_config_test.go

@@ -32,6 +32,7 @@ func TestBuildAutomationConfig(t *testing.T) {
 		SetMongoDBVersion("4.2.0").
 		SetAutomationConfigVersion(1).
 		SetMembers(3).
+		SetFCV("4.0").
 		Build()
 
 	assert.Len(t, ac.Processes, 3)
@@ -44,6 +45,7 @@ func TestBuildAutomationConfig(t *testing.T) {
 		assert.Equal(t, "my-rs", p.Args26.Replication.ReplicaSetName, "replication should be configured based on the replica set name provided")
 		assert.Equal(t, toHostName("my-rs", i), p.Name)
 		assert.Equal(t, "4.2.0", p.Version)
+		assert.Equal(t, "4.0", p.FeatureCompatibilityVersion)
 	}
 
 	assert.Len(t, ac.ReplicaSets, 1)

pkg/controller/mongodb/mongodb_controller.go

@@ -157,6 +157,7 @@ func buildAutomationConfig(mdb mdbv1.MongoDB, mdbVersionConfig automationconfig.
 		SetMembers(mdb.Spec.Members).
 		SetMongoDBVersion(mdb.Spec.Version).
 		SetAutomationConfigVersion(1). // TODO: Correctly set the version
+		SetFCV(mdb.GetFCV()).
 		AddVersion(mdbVersionConfig).
 		Build()
 }

test/e2e/e2eutil.go

@@ -97,9 +97,10 @@ func NewTestMongoDB() mdbv1.MongoDB {
 			Namespace: f.Global.Namespace,
 		},
 		Spec: mdbv1.MongoDBSpec{
-			Members: 3,
-			Type:    "ReplicaSet",
-			Version: "4.0.6",
+			Members:                     3,
+			Type:                        "ReplicaSet",
+			Version:                     "4.0.6",
+			FeatureCompatibilityVersion: "4.0",
 		},
 	}
 }