Skip to content

Commit 8ce17d4

Browse files
edimarlnxMaciejKarasviveksinghggits
authored
Fix: Use CLUSTER_DOMAIN environment variable instead of hardcoded cluster.local (#481)
## Summary This PR adds support for custom cluster domains in Kubernetes deployments by introducing a configurable `ClusterDomain` field in the MongoDB resource spec and utilizing the `CLUSTER_DOMAIN` environment variable. This change improves flexibility for deployments in Kubernetes clusters that use custom DNS suffixes instead of the default `cluster.local`. **Key Changes:** ### CRD & API Changes - Added optional `ClusterDomain` field to `MongoDBCommunitySpec` with hostname format validation - Updated CRD definitions in both `config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml` and `helm_chart/crds/mongodbcommunity.mongodb.com_mongodbcommunity.yaml` - Implemented `GetClusterDomain()` method in `mongodbcommunity_types.go:1149` with fallback hierarchy: spec field → `CLUSTER_DOMAIN` environment variable → default `cluster.local` - Added `ClusterDomainEnv` constant in `constants.go:14` with value `"CLUSTER_DOMAIN"` ### Connection URI Refactoring Removed `clusterDomain` parameter from all public URI methods - now retrieve domain directly from spec: - `MongoURI()` in `mongodbcommunity_types.go:927` - `MongoSRVURI()` in `mongodbcommunity_types.go:934` - `MongoAuthUserURI()` in `mongodbcommunity_types.go:941` - `MongoAuthUserSRVURI()` in `mongodbcommunity_types.go:955` - `Hosts()` in `mongodbcommunity_types.go:967` ### Controller Updates - Updated `buildAutomationConfig()` in `replica_set_controller.go:533` to use `mdb.Spec.GetClusterDomain()` - Modified `getMongodConfigSearchModification()` in `replica_set_controller.go:837` to accept and pass `clusterDomain` parameter - Removed environment variable reads from `Reconcile()` method in `replica_set_controller.go:237,250` - Updated `updateConnectionStringSecrets()` in `mongodb_users.go:44` to remove `clusterDomain` parameter - Modified `applySearchOverrides()` in `mongodbreplicaset_controller.go:659` to pass cluster domain to `GetMongodConfigParameters()` ### MongoDB Search Integration - Updated `GetMongodConfigParameters()` in `mongodbsearch_reconcile_helper.go:391` to accept `clusterDomain` parameter - Updated `mongotHostAndPort()` in `mongodbsearch_reconcile_helper.go:406` to accept `clusterDomain` parameter - Fixed host seed generation in `CommunitySearchSource.HostSeeds()` (`community_search_source.go:27`) - Fixed host seed generation in `EnterpriseResourceSearchSource.HostSeeds()` (`enterprise_search_source.go:25`) ### Testing - Updated all unit tests in `mongodbcommunity_types_test.go` to use spec field instead of parameter - Updated E2E tests across multiple test suites to remove cluster domain parameter from URI method calls ## Proof of Work - ✅ All hardcoded `cluster.local` references replaced with configurable cluster domain - ✅ Backward compatibility maintained with default fallback to `cluster.local` - ✅ Changelog file added documenting the fix - ✅ Code follows existing patterns and Kubernetes best practices - ✅ Unit tests updated and passing **Files modified:** - `changelog/20250925_feature_use_cluster_domain_environment_variable.md` (new) - `config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml` (added `clusterDomain` field) - `helm_chart/crds/mongodbcommunity.mongodb.com_mongodbcommunity.yaml` (added `clusterDomain` field) - `controllers/operator/mongodbreplicaset_controller.go:659` - `controllers/searchcontroller/community_search_source.go:29` - `controllers/searchcontroller/enterprise_search_source.go:27` - `controllers/searchcontroller/mongodbsearch_reconcile_helper.go:391-407` - `mongodb-community-operator/api/v1/mongodbcommunity_types.go:75,927-1152` - `mongodb-community-operator/api/v1/mongodbcommunity_types_test.go` (multiple test updates) - `mongodb-community-operator/controllers/mongodb_users.go:44-82` - `mongodb-community-operator/controllers/replica_set_controller.go:237,250,533-837` - `mongodb-community-operator/pkg/util/constants/constants.go:14` ## Checklist - [ ] Have you linked a jira ticket and/or is the ticket in the title? - [ ] Have you checked whether your jira ticket required DOCSP changes? - [x] Have you added changelog file? --------- Co-authored-by: Maciej Karaś <6159874+MaciejKaras@users.noreply.github.com> Co-authored-by: Vivek Singh <vsingh.ggits.2010@gmail.com>
1 parent cce9dd1 commit 8ce17d4

File tree

30 files changed

+102
-84
lines changed

30 files changed

+102
-84
lines changed

‎changelog/20250925_feature_use_cluster_domain_environment_variable.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
kind: feature
3+
date: 2025-09-25
4+
---
5+
6+
* **MongoDBCommunity**: Added support to configure custom cluster domain via newly introduced `spec.clusterDomain` resource field. If `spec.clusterDomain` is not set, environment variable `CLUSTER_DOMAIN` is used as cluster domain. If the environment variable `CLUSTER_DOMAIN` is also not set, operator falls back to `cluster.local` as default cluster domain.

‎config/crd/bases/mongodbcommunity.mongodb.com_mongodbcommunity.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ spec:
240240
x-kubernetes-preserve-unknown-fields: true
241241
type: object
242242
type: object
243+
clusterDomain:
244+
format: hostname
245+
type: string
243246
featureCompatibilityVersion:
244247
description: |-
245248
FeatureCompatibilityVersion configures the feature compatibility version that will

‎controllers/operator/mongodbreplicaset_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ func (r *ReconcileMongoDbReplicaSet) applySearchOverrides(ctx context.Context, r
656656
if rs.Spec.AdditionalMongodConfig == nil {
657657
rs.Spec.AdditionalMongodConfig = mdbv1.NewEmptyAdditionalMongodConfig()
658658
}
659-
searchMongodConfig := searchcontroller.GetMongodConfigParameters(search)
659+
searchMongodConfig := searchcontroller.GetMongodConfigParameters(search, rs.Spec.GetClusterDomain())
660660
rs.Spec.AdditionalMongodConfig.AddOption("setParameter", searchMongodConfig["setParameter"])
661661

662662
if searchcontroller.NeedsSearchCoordinatorRolePolyfill(rs.Spec.GetMongoDBVersion()) {

‎controllers/searchcontroller/community_search_source.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@ type CommunitySearchSource struct {
2626

2727
func (r *CommunitySearchSource) HostSeeds() []string {
2828
seeds := make([]string, r.Spec.Members)
29+
clusterDomain := r.Spec.GetClusterDomain()
2930
for i := range seeds {
30-
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.GetMongodConfiguration().GetDBPort())
31+
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.%s:%d", r.Name, i, r.ServiceName(), r.Namespace, clusterDomain, r.GetMongodConfiguration().GetDBPort())
3132
}
3233
return seeds
3334
}

‎controllers/searchcontroller/enterprise_search_source.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ func NewEnterpriseResourceSearchSource(mdb *mdbv1.MongoDB) SearchSourceDBResourc
2424

2525
func (r EnterpriseResourceSearchSource) HostSeeds() []string {
2626
seeds := make([]string, r.Spec.Members)
27+
clusterDomain := r.Spec.GetClusterDomain()
2728
for i := range seeds {
28-
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.cluster.local:%d", r.Name, i, r.ServiceName(), r.Namespace, r.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
29+
seeds[i] = fmt.Sprintf("%s-%d.%s.%s.svc.%s:%d", r.Name, i, r.ServiceName(), r.Namespace, clusterDomain, r.Spec.GetAdditionalMongodConfig().GetPortOrDefault())
2930
}
3031
return seeds
3132
}

‎controllers/searchcontroller/mongodbsearch_reconcile_helper.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -388,24 +388,24 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
388388
}
389389
}
390390

391-
func GetMongodConfigParameters(search *searchv1.MongoDBSearch) map[string]any {
391+
func GetMongodConfigParameters(search *searchv1.MongoDBSearch, clusterDomain string) map[string]any {
392392
searchTLSMode := automationconfig.TLSModeDisabled
393393
if search.Spec.Security.TLS != nil {
394394
searchTLSMode = automationconfig.TLSModeRequired
395395
}
396396
return map[string]any{
397397
"setParameter": map[string]any{
398-
"mongotHost": mongotHostAndPort(search),
399-
"searchIndexManagementHostAndPort": mongotHostAndPort(search),
398+
"mongotHost": mongotHostAndPort(search, clusterDomain),
399+
"searchIndexManagementHostAndPort": mongotHostAndPort(search, clusterDomain),
400400
"skipAuthenticationToSearchIndexManagementServer": false,
401401
"searchTLSMode": string(searchTLSMode),
402402
},
403403
}
404404
}
405405

406-
func mongotHostAndPort(search *searchv1.MongoDBSearch) string {
406+
func mongotHostAndPort(search *searchv1.MongoDBSearch, clusterDomain string) string {
407407
svcName := search.SearchServiceNamespacedName()
408-
return fmt.Sprintf("%s.%s.svc.cluster.local:%d", svcName.Name, svcName.Namespace, search.GetMongotPort())
408+
return fmt.Sprintf("%s.%s.svc.%s:%d", svcName.Name, svcName.Namespace, clusterDomain, search.GetMongotPort())
409409
}
410410

411411
func (r *MongoDBSearchReconcileHelper) ValidateSingleMongoDBSearchForSearchSource(ctx context.Context) error {

‎helm_chart/crds/mongodbcommunity.mongodb.com_mongodbcommunity.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ spec:
240240
x-kubernetes-preserve-unknown-fields: true
241241
type: object
242242
type: object
243+
clusterDomain:
244+
format: hostname
245+
type: string
243246
featureCompatibilityVersion:
244247
description: |-
245248
FeatureCompatibilityVersion configures the feature compatibility version that will

‎mongodb-community-operator/api/v1/mongodbcommunity_types.go‎

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/automationconfig"
2222
"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/kube/annotations"
2323
"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/util/constants"
24+
"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/util/envvar"
2425
"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/pkg/util/scale"
2526
)
2627

@@ -71,7 +72,8 @@ type MongoDBCommunitySpec struct {
7172
Type Type `json:"type"`
7273
// Version defines which version of MongoDB will be used
7374
Version string `json:"version,omitempty"`
74-
75+
// +kubebuilder:validation:Format="hostname"
76+
ClusterDomain string `json:"clusterDomain,omitempty"`
7577
// Arbiters is the number of arbiters to add to the Replica Set.
7678
// It is not recommended to have more than one arbiter per Replica Set.
7779
// More info: https://www.mongodb.com/docs/manual/tutorial/add-replica-set-arbiter/
@@ -922,30 +924,26 @@ func (m *MongoDBCommunity) GetUserOptionsString(user authtypes.User) string {
922924
}
923925

924926
// MongoURI returns a mongo uri which can be used to connect to this deployment
925-
func (m *MongoDBCommunity) MongoURI(clusterDomain string) string {
927+
func (m *MongoDBCommunity) MongoURI() string {
926928
optionsString := m.GetOptionsString()
927929

928-
return fmt.Sprintf("mongodb://%s/?replicaSet=%s%s", strings.Join(m.Hosts(clusterDomain), ","), m.Name, optionsString)
930+
return fmt.Sprintf("mongodb://%s/?replicaSet=%s%s", strings.Join(m.Hosts(), ","), m.Name, optionsString)
929931
}
930932

931933
// MongoSRVURI returns a mongo srv uri which can be used to connect to this deployment
932-
func (m *MongoDBCommunity) MongoSRVURI(clusterDomain string) string {
933-
if clusterDomain == "" {
934-
clusterDomain = defaultClusterDomain
935-
}
936-
934+
func (m *MongoDBCommunity) MongoSRVURI() string {
937935
optionsString := m.GetOptionsString()
938936

939-
return fmt.Sprintf("mongodb+srv://%s.%s.svc.%s/?replicaSet=%s%s", m.ServiceName(), m.Namespace, clusterDomain, m.Name, optionsString)
937+
return fmt.Sprintf("mongodb+srv://%s.%s.svc.%s/?replicaSet=%s%s", m.ServiceName(), m.Namespace, m.Spec.GetClusterDomain(), m.Name, optionsString)
940938
}
941939

942940
// MongoAuthUserURI returns a mongo uri which can be used to connect to this deployment
943941
// and includes the authentication data for the user
944-
func (m *MongoDBCommunity) MongoAuthUserURI(user authtypes.User, password string, clusterDomain string) string {
942+
func (m *MongoDBCommunity) MongoAuthUserURI(user authtypes.User, password string) string {
945943
optionsString := m.GetUserOptionsString(user)
946944
return fmt.Sprintf("mongodb://%s%s/%s?replicaSet=%s&ssl=%t%s",
947945
user.GetLoginString(password),
948-
strings.Join(m.Hosts(clusterDomain), ","),
946+
strings.Join(m.Hosts(), ","),
949947
user.Database,
950948
m.Name,
951949
m.Spec.Security.TLS.Enabled,
@@ -954,36 +952,28 @@ func (m *MongoDBCommunity) MongoAuthUserURI(user authtypes.User, password string
954952

955953
// MongoAuthUserSRVURI returns a mongo srv uri which can be used to connect to this deployment
956954
// and includes the authentication data for the user
957-
func (m *MongoDBCommunity) MongoAuthUserSRVURI(user authtypes.User, password string, clusterDomain string) string {
958-
if clusterDomain == "" {
959-
clusterDomain = defaultClusterDomain
960-
}
961-
955+
func (m *MongoDBCommunity) MongoAuthUserSRVURI(user authtypes.User, password string) string {
962956
optionsString := m.GetUserOptionsString(user)
963957
return fmt.Sprintf("mongodb+srv://%s%s.%s.svc.%s/%s?replicaSet=%s&ssl=%t%s",
964958
user.GetLoginString(password),
965959
m.ServiceName(),
966960
m.Namespace,
967-
clusterDomain,
961+
m.Spec.GetClusterDomain(),
968962
user.Database,
969963
m.Name,
970964
m.Spec.Security.TLS.Enabled,
971965
optionsString)
972966
}
973967

974-
func (m *MongoDBCommunity) Hosts(clusterDomain string) []string {
968+
func (m *MongoDBCommunity) Hosts() []string {
975969
hosts := make([]string, m.Spec.Members)
976970

977-
if clusterDomain == "" {
978-
clusterDomain = defaultClusterDomain
979-
}
980-
981971
for i := 0; i < m.Spec.Members; i++ {
982972
hosts[i] = fmt.Sprintf("%s-%d.%s.%s.svc.%s:%d",
983973
m.Name, i,
984974
m.ServiceName(),
985975
m.Namespace,
986-
clusterDomain,
976+
m.Spec.GetClusterDomain(),
987977
m.GetMongodConfiguration().GetDBPort())
988978
}
989979
return hosts
@@ -1157,6 +1147,13 @@ func (m MongoDBCommunity) GetAgentMaxLogFileDurationHours() int {
11571147
return m.Spec.AgentConfiguration.MaxLogFileDurationHours
11581148
}
11591149

1150+
func (m MongoDBCommunitySpec) GetClusterDomain() string {
1151+
if m.ClusterDomain != "" {
1152+
return m.ClusterDomain
1153+
}
1154+
return envvar.GetEnvOrDefault(constants.ClusterDomainEnv, defaultClusterDomain) // nolint:forbidigo
1155+
}
1156+
11601157
type automationConfigReplicasScaler struct {
11611158
current, desired int
11621159
forceIndividualScaling bool

‎mongodb-community-operator/api/v1/mongodbcommunity_types_test.go‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ func TestMongoDB_MongoURI(t *testing.T) {
9494
for _, params := range tests {
9595
mdb := newReplicaSet(params.members, params.name, params.namespace)
9696
mdb.Spec.AdditionalMongodConfig.Object = params.additionalMongodConfig
97-
assert.Equal(t, mdb.MongoURI(params.clusterDomain), params.connectionString)
97+
mdb.Spec.ClusterDomain = params.clusterDomain
98+
assert.Equal(t, mdb.MongoURI(), params.connectionString)
9899
}
99100
}
100101

@@ -152,30 +153,34 @@ func TestMongoDB_MongoURI_With_Options(t *testing.T) {
152153
mdb := newReplicaSet(params.members, params.name, params.namespace)
153154
mdb.Spec.AdditionalMongodConfig.Object = params.additionalMongodConfig
154155
mdb.Spec.AdditionalConnectionStringConfig.Object = params.additionalConnectionStringConfig
155-
assert.Equal(t, mdb.MongoURI(params.clusterDomain), params.connectionString)
156+
mdb.Spec.ClusterDomain = params.clusterDomain
157+
assert.Equal(t, mdb.MongoURI(), params.connectionString)
156158
}
157159
}
158160

159161
func TestMongoDB_MongoSRVURI(t *testing.T) {
160162
mdb := newReplicaSet(2, "my-rs", "my-namespace")
161-
assert.Equal(t, mdb.MongoSRVURI(""), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs")
162-
assert.Equal(t, mdb.MongoSRVURI("my.cluster"), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs")
163+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs")
164+
mdb.Spec.ClusterDomain = "my.cluster"
165+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs")
163166
}
164167

165168
func TestMongoDB_MongoSRVURI_With_Options(t *testing.T) {
166169
mdb := newReplicaSet(2, "my-rs", "my-namespace")
167170
mdb.Spec.AdditionalConnectionStringConfig.Object = map[string]interface{}{
168171
"readPreference": "primary",
169172
}
170-
assert.Equal(t, mdb.MongoSRVURI(""), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs&readPreference=primary")
171-
assert.Equal(t, mdb.MongoSRVURI("my.cluster"), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs&readPreference=primary")
173+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs&readPreference=primary")
174+
mdb.Spec.ClusterDomain = "my.cluster"
175+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs&readPreference=primary")
172176

173177
mdb = newReplicaSet(2, "my-rs", "my-namespace")
174178
mdb.Spec.AdditionalConnectionStringConfig.Object = map[string]interface{}{
175179
"readPreference": "primary", "replicaSet": "differentName", "tls": true, "ssl": true,
176180
}
177-
assert.Equal(t, mdb.MongoSRVURI(""), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs&readPreference=primary")
178-
assert.Equal(t, mdb.MongoSRVURI("my.cluster"), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs&readPreference=primary")
181+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/?replicaSet=my-rs&readPreference=primary")
182+
mdb.Spec.ClusterDomain = "my.cluster"
183+
assert.Equal(t, mdb.MongoSRVURI(), "mongodb+srv://my-rs-svc.my-namespace.svc.my.cluster/?replicaSet=my-rs&readPreference=primary")
179184
}
180185

181186
func TestMongodConfiguration(t *testing.T) {
@@ -399,7 +404,7 @@ func TestMongoDBCommunity_MongoAuthUserURI(t *testing.T) {
399404
for _, params := range tests {
400405
mdb.Spec.AdditionalConnectionStringConfig.Object = params.additionalConnectionStringConfig
401406
testuser.ConnectionStringOptions = params.userConnectionStringConfig
402-
assert.Equal(t, mdb.MongoAuthUserURI(testuser, "password", ""), params.connectionString)
407+
assert.Equal(t, mdb.MongoAuthUserURI(testuser, "password"), params.connectionString)
403408
}
404409

405410
testuser = authtypes.User{
@@ -408,7 +413,7 @@ func TestMongoDBCommunity_MongoAuthUserURI(t *testing.T) {
408413
}
409414
mdb = newReplicaSet(2, "my-rs", "my-namespace")
410415

411-
assert.Equal(t, mdb.MongoAuthUserURI(testuser, "", ""), "mongodb://my-rs-0.my-rs-svc.my-namespace.svc.cluster.local:27017,my-rs-1.my-rs-svc.my-namespace.svc.cluster.local:27017/$external?replicaSet=my-rs&ssl=false")
416+
assert.Equal(t, mdb.MongoAuthUserURI(testuser, ""), "mongodb://my-rs-0.my-rs-svc.my-namespace.svc.cluster.local:27017,my-rs-1.my-rs-svc.my-namespace.svc.cluster.local:27017/$external?replicaSet=my-rs&ssl=false")
412417
}
413418

414419
func TestMongoDBCommunity_MongoAuthUserSRVURI(t *testing.T) {
@@ -460,7 +465,7 @@ func TestMongoDBCommunity_MongoAuthUserSRVURI(t *testing.T) {
460465
for _, params := range tests {
461466
mdb.Spec.AdditionalConnectionStringConfig.Object = params.additionalConnectionStringConfig
462467
testuser.ConnectionStringOptions = params.userConnectionStringConfig
463-
assert.Equal(t, mdb.MongoAuthUserSRVURI(testuser, "password", ""), params.connectionString)
468+
assert.Equal(t, mdb.MongoAuthUserSRVURI(testuser, "password"), params.connectionString)
464469
}
465470

466471
testuser = authtypes.User{
@@ -469,7 +474,7 @@ func TestMongoDBCommunity_MongoAuthUserSRVURI(t *testing.T) {
469474
}
470475
mdb = newReplicaSet(2, "my-rs", "my-namespace")
471476

472-
assert.Equal(t, mdb.MongoAuthUserSRVURI(testuser, "", ""), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/$external?replicaSet=my-rs&ssl=false")
477+
assert.Equal(t, mdb.MongoAuthUserSRVURI(testuser, ""), "mongodb+srv://my-rs-svc.my-namespace.svc.cluster.local/$external?replicaSet=my-rs&ssl=false")
473478
}
474479

475480
func TestConvertAuthModeToAuthMechanism(t *testing.T) {

‎mongodb-community-operator/controllers/mongodb_users.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (r ReplicaSetReconciler) ensureUserResources(ctx context.Context, mdb mdbv1
4141

4242
// updateConnectionStringSecrets updates secrets where user specific connection strings are stored.
4343
// The client applications can mount these secrets and connect to the mongodb cluster
44-
func (r ReplicaSetReconciler) updateConnectionStringSecrets(ctx context.Context, mdb mdbv1.MongoDBCommunity, clusterDomain string) error {
44+
func (r ReplicaSetReconciler) updateConnectionStringSecrets(ctx context.Context, mdb mdbv1.MongoDBCommunity) error {
4545
for _, user := range mdb.GetAuthUsers() {
4646
secretName := user.ConnectionStringSecretName
4747

@@ -75,8 +75,8 @@ func (r ReplicaSetReconciler) updateConnectionStringSecrets(ctx context.Context,
7575
SetName(secretName).
7676
SetNamespace(secretNamespace).
7777
SetAnnotations(user.ConnectionStringSecretAnnotations).
78-
SetField("connectionString.standard", mdb.MongoAuthUserURI(user, pwd, clusterDomain)).
79-
SetField("connectionString.standardSrv", mdb.MongoAuthUserSRVURI(user, pwd, clusterDomain)).
78+
SetField("connectionString.standard", mdb.MongoAuthUserURI(user, pwd)).
79+
SetField("connectionString.standardSrv", mdb.MongoAuthUserSRVURI(user, pwd)).
8080
SetField("username", user.Username).
8181
SetField("password", pwd).
8282
SetOwnerReferences(mdb.GetOwnerReferences()).

0 commit comments

Comments
 (0)