From db8a84b6cb6316d40eb7fd3e7ef53b9cf2fd84ec Mon Sep 17 00:00:00 2001 From: Mikalai Radchuk <509198+m1kola@users.noreply.github.com> Date: Fri, 7 Nov 2025 11:25:18 +0100 Subject: [PATCH 1/2] Fix linting --- .../mongodbreplicaset_controller_multi_test.go | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/controllers/operator/mongodbreplicaset_controller_multi_test.go b/controllers/operator/mongodbreplicaset_controller_multi_test.go index f97b6a861..795ff0782 100644 --- a/controllers/operator/mongodbreplicaset_controller_multi_test.go +++ b/controllers/operator/mongodbreplicaset_controller_multi_test.go @@ -97,22 +97,6 @@ func checkReplicaSetReconcileSuccessful( assert.NoError(t, err) } -// getReplicaSetMultiClusterMap simulates multiple K8s clusters using fake clients -func getReplicaSetMultiClusterMap(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 -} - // TestReplicaSetMultiClusterScaling tests that multi-cluster ReplicaSets scale one member at a time // across all clusters, similar to single-cluster behavior. // From 6c9a36f5bdda1b1bcac5d6062cd937a20bae3252 Mon Sep 17 00:00:00 2001 From: Mikalai Radchuk <509198+m1kola@users.noreply.github.com> Date: Fri, 7 Nov 2025 16:52:29 +0100 Subject: [PATCH 2/2] Revert `GetMultiServiceFQDN` It was breaking a lot of unit end e2e tests. --- pkg/dns/dns.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 8872eff11..189a5a983 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -37,10 +37,7 @@ func GetMultiServiceFQDN(stsName string, namespace string, clusterNum int, podNu domain = strings.TrimPrefix(clusterDomain, ".") } - // For StatefulSet pods, DNS format is: ...svc. - podName := GetMultiPodName(stsName, clusterNum, podNum) - headlessService := GetMultiHeadlessServiceName(stsName, clusterNum) - return fmt.Sprintf("%s.%s.%s.svc.%s", podName, headlessService, namespace, domain) + return fmt.Sprintf("%s.%s.svc.%s", GetMultiServiceName(stsName, clusterNum, podNum), namespace, domain) } func GetMultiServiceExternalDomain(stsName, externalDomain string, clusterNum, podNum int) string {