CLOUDP-302068: Refactor GetMongoVersionForAutomationConfig (#4140)

Refactors `GetMongoVersionForAutomationConfig` in a way that it no
longer reads `MDB_ASSUME_ENTERPRISE_IMAGE` and `MONGODB_IMAGE` env vars
directly and receives these in arguments.

This will help with merging the community operator and the enterprise
operators into a single process.

Note that more refactoring is needed to be able to merge these. There
are several places with `FIXME(Mikalai)` comments and a follow up for
these is cumming in the next iteration. The effort was split into
multiple parts for more manageable code review.

Author: m1kola

controllers/om/deployment/om_deployment_test.go

@@ -24,14 +24,14 @@ func init() {
 func TestPrepareScaleDown_OpsManagerRemovedMember(t *testing.T) {
 	// This is deployment with 2 members (emulating that OpsManager removed the 3rd one)
 	rs := mdbv1.NewReplicaSetBuilder().SetName("bam").SetMembers(2).Build()
-	oldDeployment := CreateFromReplicaSet(rs)
+	oldDeployment := CreateFromReplicaSet("fake-mongoDBImage", false, rs)
 	mockedOmConnection := om.NewMockedOmConnection(oldDeployment)
 
 	// We try to prepare two members for scale down, but one of them will fail (bam-2)
 	rsWithThreeMembers := map[string][]string{"bam": {"bam-1", "bam-2"}}
 	assert.NoError(t, replicaset.PrepareScaleDownFromMap(mockedOmConnection, rsWithThreeMembers, rsWithThreeMembers["bam"], zap.S()))
 
-	expectedDeployment := CreateFromReplicaSet(rs)
+	expectedDeployment := CreateFromReplicaSet("fake-mongoDBImage", false, rs)
 
 	assert.NoError(t, expectedDeployment.MarkRsMembersUnvoted("bam", []string{"bam-1"}))
 

controllers/om/deployment/testing_utils.go

@@ -18,7 +18,7 @@ import (
 // different packages. And test files are only compiled
 // when testing that specific package
 // https://github.com/golang/go/issues/10184#issuecomment-84465873
-func CreateFromReplicaSet(rs *mdb.MongoDB) om.Deployment {
+func CreateFromReplicaSet(mongoDBImage string, forceEnterprise bool, rs *mdb.MongoDB) om.Deployment {
 	sts := construct.DatabaseStatefulSet(*rs, construct.ReplicaSetOptions(
 		func(options *construct.DatabaseStatefulSetOptions) {
 			options.PodVars = &env.PodEnvVars{ProjectID: "abcd"}
@@ -32,7 +32,7 @@ func CreateFromReplicaSet(rs *mdb.MongoDB) om.Deployment {
 	}
 
 	d.MergeReplicaSet(
-		replicaset.BuildFromStatefulSet(sts, rs.GetSpec(), rs.Status.FeatureCompatibilityVersion),
+		replicaset.BuildFromStatefulSet(mongoDBImage, forceEnterprise, sts, rs.GetSpec(), rs.Status.FeatureCompatibilityVersion),
 		rs.Spec.AdditionalMongodConfig.ToMap(),
 		lastConfig.ToMap(),
 		zap.S(),

controllers/om/deployment_test.go

@@ -63,7 +63,7 @@ func TestMergeReplicaSet(t *testing.T) {
 
 	// Now the deployment "gets updated" from external - new node is added and one is removed - this should be fixed
 	// by merge
-	newProcess := NewMongodProcess("foo", "bar", &mdbv1.AdditionalMongodConfig{}, &mdbv1.NewStandaloneBuilder().Build().Spec, "", nil, "")
+	newProcess := NewMongodProcess("foo", "bar", "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, &mdbv1.NewStandaloneBuilder().Build().Spec, "", nil, "")
 
 	d.getProcesses()[0]["processType"] = ProcessTypeMongos                            // this will be overriden
 	d.getProcesses()[1].EnsureNetConfig()["MaxIncomingConnections"] = 20              // this will be left as-is
@@ -742,15 +742,15 @@ func buildRsByProcesses(rsName string, processes []Process) ReplicaSetWithProces
 }
 
 func createStandalone() Process {
-	return NewMongodProcess("merchantsStandalone", "mongo1.some.host", &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
+	return NewMongodProcess("merchantsStandalone", "mongo1.some.host", "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
 }
 
 func createMongosProcesses(num int, name, clusterName string) []Process {
 	mongosProcesses := make([]Process, num)
 
 	for i := 0; i < num; i++ {
 		idx := strconv.Itoa(i)
-		mongosProcesses[i] = NewMongosProcess(name+idx, "mongoS"+idx+".some.host", &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
+		mongosProcesses[i] = NewMongosProcess(name+idx, "mongoS"+idx+".some.host", "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
 		if clusterName != "" {
 			mongosProcesses[i].setCluster(clusterName)
 		}
@@ -766,7 +766,7 @@ func createReplicaSetProcessesCount(count int, rsName string) []Process {
 	rsMembers := make([]Process, count)
 
 	for i := 0; i < count; i++ {
-		rsMembers[i] = NewMongodProcess(fmt.Sprintf("%s-%d", rsName, i), fmt.Sprintf("%s-%d.some.host", rsName, i), &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
+		rsMembers[i] = NewMongodProcess(fmt.Sprintf("%s-%d", rsName, i), fmt.Sprintf("%s-%d.some.host", rsName, i), "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3"), "", nil, "")
 		// Note that we don't specify the replicaset config for process
 	}
 	return rsMembers
@@ -776,7 +776,7 @@ func createReplicaSetProcessesCountEnt(count int, rsName string) []Process {
 	rsMembers := make([]Process, count)
 
 	for i := 0; i < count; i++ {
-		rsMembers[i] = NewMongodProcess(fmt.Sprintf("%s-%d", rsName, i), fmt.Sprintf("%s-%d.some.host", rsName, i), &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3-ent"), "", nil, "")
+		rsMembers[i] = NewMongodProcess(fmt.Sprintf("%s-%d", rsName, i), fmt.Sprintf("%s-%d.some.host", rsName, i), "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, defaultMongoDBVersioned("3.6.3-ent"), "", nil, "")
 		// Note that we don't specify the replicaset config for process
 	}
 	return rsMembers

controllers/om/depshardedcluster_test.go

@@ -110,7 +110,7 @@ func TestMergeShardedCluster_ReplicaSetsModified(t *testing.T) {
 	// These OM changes must be overriden
 	(*d.getReplicaSetByName("cluster-0"))["protocolVersion"] = util.Int32Ref(2)
 	(*d.getReplicaSetByName("configSrv")).addMember(
-		NewMongodProcess("foo", "bar", &mdbv1.AdditionalMongodConfig{}, mdbv1.NewStandaloneBuilder().Build().GetSpec(), "", nil, ""), "", automationconfig.MemberOptions{},
+		NewMongodProcess("foo", "bar", "fake-mongoDBImage", false, &mdbv1.AdditionalMongodConfig{}, mdbv1.NewStandaloneBuilder().Build().GetSpec(), "", nil, ""), "", automationconfig.MemberOptions{},
 	)
 	(*d.getReplicaSetByName("cluster-2")).setMembers(d.getReplicaSetByName("cluster-2").Members()[0:2])
 

controllers/om/process.go

@@ -94,17 +94,19 @@ func NewProcessFromInterface(i interface{}) Process {
 	return i.(map[string]interface{})
 }
 
-func NewMongosProcess(name, hostName string, additionalMongodConfig *mdbv1.AdditionalMongodConfig, spec mdbv1.DbSpec, certificateFilePath string, annotations map[string]string, fcv string) Process {
+func NewMongosProcess(name, hostName, mongoDBImage string, forceEnterprise bool, additionalMongodConfig *mdbv1.AdditionalMongodConfig, spec mdbv1.DbSpec, certificateFilePath string, annotations map[string]string, fcv string) Process {
 	if additionalMongodConfig == nil {
 		additionalMongodConfig = mdbv1.NewEmptyAdditionalMongodConfig()
 	}
 
+	architecture := architectures.GetArchitecture(annotations)
+	processVersion := architectures.GetMongoVersionForAutomationConfig(mongoDBImage, spec.GetMongoDBVersion(nil), forceEnterprise, architecture)
 	p := createProcess(
 		WithName(name),
 		WithHostname(hostName),
 		WithProcessType(ProcessTypeMongos),
 		WithAdditionalMongodConfig(*additionalMongodConfig),
-		WithResourceSpec(spec, annotations, fcv),
+		WithResourceSpec(processVersion, fcv),
 	)
 
 	// default values for configurable values
@@ -118,17 +120,19 @@ func NewMongosProcess(name, hostName string, additionalMongodConfig *mdbv1.Addit
 	return p
 }
 
-func NewMongodProcess(name, hostName string, additionalConfig *mdbv1.AdditionalMongodConfig, spec mdbv1.DbSpec, certificateFilePath string, annotations map[string]string, fcv string) Process {
+func NewMongodProcess(name, hostName, mongoDBImage string, forceEnterprise bool, additionalConfig *mdbv1.AdditionalMongodConfig, spec mdbv1.DbSpec, certificateFilePath string, annotations map[string]string, fcv string) Process {
 	if additionalConfig == nil {
 		additionalConfig = mdbv1.NewEmptyAdditionalMongodConfig()
 	}
 
+	architecture := architectures.GetArchitecture(annotations)
+	processVersion := architectures.GetMongoVersionForAutomationConfig(mongoDBImage, spec.GetMongoDBVersion(nil), forceEnterprise, architecture)
 	p := createProcess(
 		WithName(name),
 		WithHostname(hostName),
 		WithProcessType(ProcessTypeMongod),
 		WithAdditionalMongodConfig(*additionalConfig),
-		WithResourceSpec(spec, annotations, fcv),
+		WithResourceSpec(processVersion, fcv),
 	)
 
 	// default values for configurable values
@@ -395,9 +399,8 @@ func createProcess(opts ...ProcessOption) Process {
 
 type ProcessOption func(process Process)
 
-func WithResourceSpec(resourceSpec mdbv1.DbSpec, annotations map[string]string, fcv string) ProcessOption {
+func WithResourceSpec(processVersion, fcv string) ProcessOption {
 	return func(process Process) {
-		processVersion := architectures.GetMongoVersionForAutomationConfig(resourceSpec.GetMongoDBVersion(nil), annotations)
 		process["version"] = processVersion
 		process["authSchemaVersion"] = CalculateAuthSchemaVersion()
 		process["featureCompatibilityVersion"] = fcv

controllers/om/process/om_process.go

@@ -13,7 +13,7 @@ import (
 	"github.com/10gen/ops-manager-kubernetes/pkg/util"
 )
 
-func CreateMongodProcessesWithLimit(set appsv1.StatefulSet, dbSpec mdbv1.DbSpec, limit int, fcv string) []om.Process {
+func CreateMongodProcessesWithLimit(mongoDBImage string, forceEnterprise bool, set appsv1.StatefulSet, dbSpec mdbv1.DbSpec, limit int, fcv string) []om.Process {
 	hostnames, names := dns.GetDnsForStatefulSetReplicasSpecified(set, dbSpec.GetClusterDomain(), limit, dbSpec.GetExternalDomain())
 	processes := make([]om.Process, len(hostnames))
 
@@ -23,14 +23,14 @@ func CreateMongodProcessesWithLimit(set appsv1.StatefulSet, dbSpec mdbv1.DbSpec,
 	}
 
 	for idx, hostname := range hostnames {
-		processes[idx] = om.NewMongodProcess(names[idx], hostname, dbSpec.GetAdditionalMongodConfig(), dbSpec, certificateFileName, set.Annotations, fcv)
+		processes[idx] = om.NewMongodProcess(names[idx], hostname, mongoDBImage, forceEnterprise, dbSpec.GetAdditionalMongodConfig(), dbSpec, certificateFileName, set.Annotations, fcv)
 	}
 
 	return processes
 }
 
 // CreateMongodProcessesWithLimitMulti creates the process array for automationConfig based on MultiCluster CR spec
-func CreateMongodProcessesWithLimitMulti(mrs mdbmultiv1.MongoDBMultiCluster, certFileName string) ([]om.Process, error) {
+func CreateMongodProcessesWithLimitMulti(mongoDBImage string, forceEnterprise bool, mrs mdbmultiv1.MongoDBMultiCluster, certFileName string) ([]om.Process, error) {
 	hostnames := make([]string, 0)
 	clusterNums := make([]int, 0)
 	podNum := make([]int, 0)
@@ -50,7 +50,7 @@ func CreateMongodProcessesWithLimitMulti(mrs mdbmultiv1.MongoDBMultiCluster, cer
 
 	processes := make([]om.Process, len(hostnames))
 	for idx := range hostnames {
-		processes[idx] = om.NewMongodProcess(fmt.Sprintf("%s-%d-%d", mrs.Name, clusterNums[idx], podNum[idx]), hostnames[idx], mrs.Spec.GetAdditionalMongodConfig(), &mrs.Spec, certFileName, mrs.Annotations, mrs.CalculateFeatureCompatibilityVersion())
+		processes[idx] = om.NewMongodProcess(fmt.Sprintf("%s-%d-%d", mrs.Name, clusterNums[idx], podNum[idx]), hostnames[idx], mongoDBImage, forceEnterprise, mrs.Spec.GetAdditionalMongodConfig(), &mrs.Spec, certFileName, mrs.Annotations, mrs.CalculateFeatureCompatibilityVersion())
 	}
 
 	return processes, nil