CLOUDP-302068: Decouple CRD types from architectures package (#4118)

`architectures.GetMongoVersionForAutomationConfig` reads from
environemnt variables and it makes it difficult parametrise the operator
which is something we need to do if we want to merge enterprise and
community operators together.

Author: m1kola

api/v1/mdb/mongodb_types.go

@@ -30,7 +30,6 @@ import (
 	"github.com/10gen/ops-manager-kubernetes/pkg/fcv"
 	"github.com/10gen/ops-manager-kubernetes/pkg/kube"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util"
-	"github.com/10gen/ops-manager-kubernetes/pkg/util/architectures"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util/env"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util/stringutil"
 )
@@ -671,7 +670,7 @@ func (m *MongoDB) CurrentReplicas() int {
 
 // GetMongoDBVersion returns the version of the MongoDB.
 func (m *MongoDbSpec) GetMongoDBVersion(annotations map[string]string) string {
-	return architectures.GetMongoVersionForAutomationConfig(m.Version, annotations)
+	return m.Version
 }
 
 func (m *MongoDbSpec) GetClusterDomain() string {

api/v1/mdbmulti/mongodb_multi_types.go

@@ -27,7 +27,6 @@ import (
 	"github.com/10gen/ops-manager-kubernetes/pkg/kube"
 	"github.com/10gen/ops-manager-kubernetes/pkg/multicluster/failedcluster"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util"
-	"github.com/10gen/ops-manager-kubernetes/pkg/util/architectures"
 	intp "github.com/10gen/ops-manager-kubernetes/pkg/util/int"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util/stringutil"
 )
@@ -504,7 +503,7 @@ func (m *MongoDBMultiSpec) GetClusterDomain() string {
 }
 
 func (m *MongoDBMultiSpec) GetMongoDBVersion(annotations map[string]string) string {
-	return architectures.GetMongoVersionForAutomationConfig(m.Version, annotations)
+	return m.Version
 }
 
 func (m *MongoDBMultiSpec) GetSecurityAuthenticationModes() []string {

api/v1/om/appdb_types.go

@@ -21,7 +21,6 @@ import (
 	"github.com/10gen/ops-manager-kubernetes/pkg/kube"
 	"github.com/10gen/ops-manager-kubernetes/pkg/multicluster"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util"
-	"github.com/10gen/ops-manager-kubernetes/pkg/util/architectures"
 	"github.com/10gen/ops-manager-kubernetes/pkg/vault"
 )
 
@@ -280,11 +279,6 @@ type AppDbBuilder struct {
 	appDb *AppDBSpec
 }
 
-// GetMongoDBVersionStatic returns the version of the MongoDB.
-func (m *AppDBSpec) GetMongoDBVersionStatic() string {
-	return architectures.GetMongoVersionForAutomationConfig(m.Version, nil)
-}
-
 // GetMongoDBVersion returns the version of the MongoDB.
 // For AppDB we directly rely on the version field which can
 // contain -ent or not for enterprise and static containers.

controllers/om/process.go

@@ -13,6 +13,7 @@ import (
 	mdbv1 "github.com/10gen/ops-manager-kubernetes/api/v1/mdb"
 	"github.com/10gen/ops-manager-kubernetes/pkg/tls"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util"
+	"github.com/10gen/ops-manager-kubernetes/pkg/util/architectures"
 	"github.com/10gen/ops-manager-kubernetes/pkg/util/maputil"
 )
 
@@ -396,7 +397,7 @@ type ProcessOption func(process Process)
 
 func WithResourceSpec(resourceSpec mdbv1.DbSpec, annotations map[string]string, fcv string) ProcessOption {
 	return func(process Process) {
-		processVersion := resourceSpec.GetMongoDBVersion(annotations)
+		processVersion := architectures.GetMongoVersionForAutomationConfig(resourceSpec.GetMongoDBVersion(nil), annotations)
 		process["version"] = processVersion
 		process["authSchemaVersion"] = CalculateAuthSchemaVersion()
 		process["featureCompatibilityVersion"] = fcv