First test correctly failing

Author: Julien-Ben

api/v1/mdb/mongodb_validation.go

@@ -327,7 +327,7 @@ func additionalMongodConfig(ms MongoDbSpec) v1.ValidationResult {
 }
 
 func replicasetMemberIsSpecified(ms MongoDbSpec) v1.ValidationResult {
-	if ms.ResourceType == ReplicaSet && ms.Members == 0 {
+	if ms.ResourceType == ReplicaSet && !ms.IsMultiCluster() && ms.Members == 0 {
 		return v1.ValidationError("'spec.members' must be specified if type of MongoDB is %s", ms.ResourceType)
 	}
 	return v1.ValidationSuccess()

api/v1/mdb/mongodbbuilder.go

@@ -24,9 +24,16 @@ func NewDefaultReplicaSetBuilder() *MongoDBBuilder {
 }
 
 func NewDefaultMultiReplicaSetBuilder() *MongoDBBuilder {
-	return defaultMongoDB(ReplicaSet).
-		SetMultiClusterTopology().
-		SetDefaultClusterSpecList()
+	b := defaultMongoDB(ReplicaSet).
+		SetMultiClusterTopology()
+
+	// Set test OpsManager config and credentials (matching multi-cluster test fixtures)
+	b.mdb.Spec.OpsManagerConfig = &PrivateCloudConfig{
+		ConfigMapRef: ConfigMapRef{Name: "my-project"},
+	}
+	b.mdb.Spec.Credentials = "my-credentials"
+
+	return b
 }
 
 func NewDefaultShardedClusterBuilder() *MongoDBBuilder {
@@ -288,6 +295,16 @@ func (b *MongoDBBuilder) SetDefaultClusterSpecList() *MongoDBBuilder {
 	return b
 }
 
+func (b *MongoDBBuilder) SetClusterSpectList(clusters []string) *MongoDBBuilder {
+	for _, e := range clusters {
+		b.mdb.Spec.ClusterSpecList = append(b.mdb.Spec.ClusterSpecList, ClusterSpecItem{
+			ClusterName: e,
+			Members:     1, // number of cluster members b/w 1 to 5
+		})
+	}
+	return b
+}
+
 func (b *MongoDBBuilder) SetAllClusterSpecLists(clusterSpecList ClusterSpecList) *MongoDBBuilder {
 	b.mdb.Spec.ShardSpec.ClusterSpecList = clusterSpecList
 	b.mdb.Spec.ConfigSrvSpec.ClusterSpecList = clusterSpecList
@@ -314,7 +331,7 @@ func defaultMongoDB(resourceType ResourceType) *MongoDBBuilder {
 			ResourceType: resourceType,
 		},
 	}
-	mdb := &MongoDB{Spec: spec, ObjectMeta: metav1.ObjectMeta{Name: "test-mdb", Namespace: "testNS"}}
+	mdb := &MongoDB{Spec: spec, ObjectMeta: metav1.ObjectMeta{Name: "test-mdb", Namespace: "my-namespace"}}
 	mdb.InitDefaults()
 	return &MongoDBBuilder{mdb}
 }

controllers/operator/mongodbreplicaset_controller_multi_test.go

@@ -2,57 +2,136 @@ package operator
 
 import (
 	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/interceptor"
+	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+
+	appsv1 "k8s.io/api/apps/v1"
+
 	mdbv1 "github.com/mongodb/mongodb-kubernetes/api/v1/mdb"
 	"github.com/mongodb/mongodb-kubernetes/controllers/om"
 	"github.com/mongodb/mongodb-kubernetes/controllers/operator/mock"
 	kubernetesClient "github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/kube/client"
 	"github.com/mongodb/mongodb-kubernetes/pkg/images"
 	"github.com/mongodb/mongodb-kubernetes/pkg/kube"
 	"github.com/mongodb/mongodb-kubernetes/pkg/util"
-	"github.com/stretchr/testify/assert"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/reconcile"
-	"testing"
 )
 
-// NedDefaultMultiReplicaSetBuilder
+func init() {
+	logger, _ := zap.NewDevelopment()
+	zap.ReplaceGlobals(logger)
+}
+
+var multiClusters = []string{"api1.kube.com", "api2.kube.com", "api3.kube.com"}
 
 func TestCreateMultiClusterReplicaSet(t *testing.T) {
 	ctx := context.Background()
-	rs := mdbv1.NewDefaultMultiReplicaSetBuilder().Build()
 
-	reconciler, client, _, _ := defaultMultiClusterReplicaSetReconciler(ctx, nil, "", "", mrs)
-	checkMultiReplicaSetReconcileSuccessful(ctx, t, reconciler, rs, client, false)
+	rs := mdbv1.NewDefaultMultiReplicaSetBuilder().
+		SetClusterSpectList(multiClusters).
+		Build()
+
+	reconciler, kubeClient, memberClients, omConnectionFactory := defaultMultiClusterReplicaSetReconciler(ctx, nil, "", "", rs)
+	checkMultiReplicaSetReconcileSuccessful(ctx, t, reconciler, rs, kubeClient, false)
+
+	// Verify StatefulSets exist in each member cluster
+	for i, clusterName := range multiClusters {
+		memberClient := memberClients[clusterName]
+		sts := appsv1.StatefulSet{}
+		stsName := fmt.Sprintf("%s-%d", rs.Name, i)
+		err := memberClient.Get(ctx, kube.ObjectKey(rs.Namespace, stsName), &sts)
+		require.NoError(t, err, "StatefulSet should exist in cluster %s", clusterName)
+		assert.Equal(t, int32(1), *sts.Spec.Replicas, "Replicas in %s", clusterName)
+	}
+
+	// Verify OM automation config has all processes
+	processes := omConnectionFactory.GetConnection().(*om.MockedOmConnection).GetProcesses()
+	assert.Len(t, processes, 3)
 }
 
-func checkMultiReplicaSetReconcileSuccessful(ctx context.Context, t *testing.T, reconciler reconcile.Reconciler, m *mdbv1.MongoDB, client client.Client, shouldRequeue bool) {
+// Helper functions below
+
+func checkMultiReplicaSetReconcileSuccessful(
+	ctx context.Context,
+	t *testing.T,
+	reconciler reconcile.Reconciler,
+	m *mdbv1.MongoDB,
+	client client.Client,
+	shouldRequeue bool,
+) {
 	err := client.Update(ctx, m)
 	assert.NoError(t, err)
 
 	result, e := reconciler.Reconcile(ctx, requestFromObject(m))
 	assert.NoError(t, e)
+
 	if shouldRequeue {
 		assert.True(t, result.Requeue || result.RequeueAfter > 0)
 	} else {
 		assert.Equal(t, reconcile.Result{RequeueAfter: util.TWENTY_FOUR_HOURS}, result)
 	}
 
-	// fetch the last updates as the reconciliation loop can update the mdb resource.
 	err = client.Get(ctx, kube.ObjectKey(m.Namespace, m.Name), m)
 	assert.NoError(t, err)
 }
 
-func multiClusterReplicaSetReconciler(ctx context.Context, imageUrls images.ImageUrls, initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion string, m *mdbv1.MongoDB) (*ReconcileMongoDbReplicaSet, kubernetesClient.Client, map[string]client.Client, *om.CachedOMConnectionFactory) {
-	kubeClient, omConnectionFactory := mock.NewDefaultFakeClient(m)
-	memberClusterMap := getFakeMultiClusterMap(omConnectionFactory)
-	return newReplicaSetReconciler(ctx, kubeClient, imageUrls, initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion, false, false, memberClusterMap, omConnectionFactory.GetConnectionFunc), kubeClient, memberClusterMap, omConnectionFactory
+func multiClusterReplicaSetReconciler(
+	ctx context.Context,
+	imageUrls images.ImageUrls,
+	initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion string,
+	rs *mdbv1.MongoDB,
+) (*ReconcileMongoDbReplicaSet, kubernetesClient.Client, map[string]client.Client, *om.CachedOMConnectionFactory) {
+	kubeClient, omConnectionFactory := mock.NewDefaultFakeClient(rs)
+	memberClusterMap := getMockMultiClusterMap(omConnectionFactory)
+
+	return newReplicaSetReconciler(
+		ctx,
+		kubeClient,
+		imageUrls,
+		initDatabaseNonStaticImageVersion,
+		databaseNonStaticImageVersion,
+		false,
+		false,
+		memberClusterMap,
+		omConnectionFactory.GetConnectionFunc,
+	), kubeClient, memberClusterMap, omConnectionFactory
 }
 
-func defaultMultiClusterReplicaSetReconciler(ctx context.Context, imageUrls images.ImageUrls, initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion string, rs *mdbv1.MongoDB) (*ReconcileMongoDbReplicaSet, kubernetesClient.Client, map[string]client.Client, *om.CachedOMConnectionFactory) {
-	multiReplicaSetController, client, clusterMap, omConnectionFactory := multiClusterReplicaSetReconciler(ctx, imageUrls, initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion, rs)
+func defaultMultiClusterReplicaSetReconciler(
+	ctx context.Context,
+	imageUrls images.ImageUrls,
+	initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion string,
+	rs *mdbv1.MongoDB,
+) (*ReconcileMongoDbReplicaSet, kubernetesClient.Client, map[string]client.Client, *om.CachedOMConnectionFactory) {
+	multiReplicaSetController, client, clusterMap, omConnectionFactory := multiClusterReplicaSetReconciler(
+		ctx, imageUrls, initDatabaseNonStaticImageVersion, databaseNonStaticImageVersion, rs,
+	)
+
 	omConnectionFactory.SetPostCreateHook(func(connection om.Connection) {
-		connection.(*om.MockedOmConnection).Hostnames = calculateHostNamesForExternalDomains(rs)
+		connection.(*om.MockedOmConnection).Hostnames = nil
 	})
 
 	return multiReplicaSetController, client, clusterMap, omConnectionFactory
 }
+
+// getMockMultiClusterMap simulates multiple K8s clusters using fake clients
+func getMockMultiClusterMap(omConnectionFactory *om.CachedOMConnectionFactory) map[string]client.Client {
+	clientMap := make(map[string]client.Client)
+
+	for _, clusterName := range multiClusters {
+		fakeClientBuilder := mock.NewEmptyFakeClientBuilder()
+		fakeClientBuilder.WithInterceptorFuncs(interceptor.Funcs{
+			Get: mock.GetFakeClientInterceptorGetFunc(omConnectionFactory, true, true),
+		})
+
+		clientMap[clusterName] = kubernetesClient.NewClient(fakeClientBuilder.Build())
+	}
+
+	return clientMap
+}