post-merge fixes

Author: fealebenpae

controllers/search_controller/community_search_source.go

@@ -1,6 +1,7 @@
 package search_controller
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/blang/semver"
@@ -19,38 +20,22 @@ type CommunitySearchSource struct {
 	*mdbcv1.MongoDBCommunity
 }
 
-func (r *CommunitySearchSource) Members() int {
-	return r.Spec.Members
-}
-
-func (r *CommunitySearchSource) GetName() string {
-	return r.Name
-}
-
-func (r *CommunitySearchSource) NamespacedName() types.NamespacedName {
-	return r.MongoDBCommunity.NamespacedName()
+func (r *CommunitySearchSource) HostSeeds() []string {
+	seeds := make([]string, r.Spec.Members)
+	for i := range seeds {
+		seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.GetMongodConfiguration().GetDBPort())
+	}
+	return seeds
 }
 
 func (r *CommunitySearchSource) KeyfileSecretName() string {
 	return r.MongoDBCommunity.GetAgentKeyfileSecretNamespacedName().Name
 }
 
-func (r *CommunitySearchSource) GetNamespace() string {
-	return r.Namespace
-}
-
-func (r *CommunitySearchSource) DatabaseServiceName() string {
-	return r.ServiceName()
-}
-
 func (r *CommunitySearchSource) IsSecurityTLSConfigEnabled() bool {
 	return r.Spec.Security.TLS.Enabled
 }
 
-func (r *CommunitySearchSource) DatabasePort() int {
-	return r.MongoDBCommunity.GetMongodConfiguration().GetDBPort()
-}
-
 func (r *CommunitySearchSource) TLSOperatorCASecretNamespacedName() types.NamespacedName {
 	return r.MongoDBCommunity.TLSOperatorCASecretNamespacedName()
 }

controllers/search_controller/enterprise_search_source.go

@@ -20,27 +20,12 @@ func NewEnterpriseResourceSearchSource(mdb *mdbv1.MongoDB) SearchSourceDBResourc
 	return EnterpriseResourceSearchSource{mdb}
 }
 
-func (r EnterpriseResourceSearchSource) NamespacedName() types.NamespacedName {
-	return types.NamespacedName{
-		Name:      r.Name,
-		Namespace: r.Namespace,
+func (r EnterpriseResourceSearchSource) HostSeeds() []string {
+	seeds := make([]string, r.Spec.Members)
+	for i := range seeds {
+		seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
 	}
-}
-
-func (r EnterpriseResourceSearchSource) Members() int {
-	return r.Spec.Replicas()
-}
-
-func (r EnterpriseResourceSearchSource) GetMongoDBVersion() string {
-	return r.Spec.GetMongoDBVersion()
-}
-
-func (r EnterpriseResourceSearchSource) DatabasePort() int {
-	return int(r.MongoDB.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
-}
-
-func (r EnterpriseResourceSearchSource) DatabaseServiceName() string {
-	return r.ServiceName()
+	return seeds
 }
 
 func (r EnterpriseResourceSearchSource) KeyfileSecretName() string {

controllers/search_controller/external_search_source.go

@@ -0,0 +1,46 @@
+package search_controller
+
+import (
+	"k8s.io/apimachinery/pkg/types"
+
+	searchv1 "github.com/mongodb/mongodb-kubernetes/api/v1/search"
+)
+
+func NewExternalSearchSource(namespace string, spec *searchv1.ExternalMongoDBSource) SearchSourceDBResource {
+	return &externalSearchResource{namespace: namespace, spec: spec}
+}
+
+// externalSearchResource implements SearchSourceDBResource for deployments managed outside the operator.
+type externalSearchResource struct {
+	namespace string
+	spec      *searchv1.ExternalMongoDBSource
+}
+
+func (r *externalSearchResource) Validate() error {
+	return nil
+}
+
+func (r *externalSearchResource) KeyfileSecretName() string {
+	if r.spec.KeyFileSecretKeyRef != nil {
+		return r.spec.KeyFileSecretKeyRef.Name
+	}
+
+	return ""
+}
+
+func (r *externalSearchResource) IsSecurityTLSConfigEnabled() bool {
+	return r.spec.TLS != nil && r.spec.TLS.Enabled
+}
+
+func (r *externalSearchResource) TLSOperatorCASecretNamespacedName() types.NamespacedName {
+	if r.spec.TLS != nil && r.spec.TLS.CA != nil {
+		return types.NamespacedName{
+			Name:      r.spec.TLS.CA.Name,
+			Namespace: r.namespace,
+		}
+	}
+
+	return types.NamespacedName{}
+}
+
+func (r *externalSearchResource) HostSeeds() []string { return r.spec.HostAndPorts }