Skip to content

Commit 708d4e8

Browse files
committed
Using auth source and
1 parent 5d44ddc commit 708d4e8

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

controllers/operator/mongodbsearch_controller_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
8686
PasswordFile: "/tmp/sourceUserPassword",
8787
TLS: ptr.To(false),
8888
ReadPreference: ptr.To("secondaryPreferred"),
89+
AuthSource: ptr.To("admin"),
8990
},
9091
},
9192
Storage: mongot.ConfigStorage{

controllers/search_controller/mongodbsearch_reconcile_helper.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
330330
PasswordFile: "/tmp/sourceUserPassword",
331331
TLS: ptr.To(false),
332332
ReadPreference: ptr.To("secondaryPreferred"),
333+
AuthSource: ptr.To("admin"),
333334
},
334335
}
335336
config.Storage = mongot.ConfigStorage{

helm_chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,4 +229,4 @@ search:
229229
repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com
230230
name: mongot/community
231231
# default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
232-
version: d6884ae132aab30497af55dbaff05e8274e9775f
232+
version: fbd60fb055dd500058edcb45677ea85d19421f47

mongodb-community-operator/pkg/mongot/mongot_config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ type ConfigReplicaSet struct {
3333
PasswordFile string `json:"passwordFile"`
3434
TLS *bool `json:"tls,omitempty"`
3535
ReadPreference *string `json:"readPreference,omitempty"`
36+
AuthSource *string `json:"authSource,omitempty"`
3637
}
3738

3839
type ConfigStorage struct {

scripts/dev/contexts/e2e_mdb_community

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ export OM_EXTERNALLY_CONFIGURED="true"
1313

1414
# Temporary development images built from mongot master
1515
#export MDB_SEARCH_COMMUNITY_VERSION="776d43523d185b6b234289e17c191712a3e6569b" # master
16-
export MDB_SEARCH_COMMUNITY_VERSION="d6884ae132aab30497af55dbaff05e8274e9775f" # Local->Admin
16+
#export MDB_SEARCH_COMMUNITY_VERSION="d6884ae132aab30497af55dbaff05e8274e9775f" # Local->Admin
1717
#export MDB_SEARCH_COMMUNITY_VERSION="ad8acf5c3a045d6e0306ad67d61fcb5be40f57ae" # hardcoded mdbc-rs replicaset name
1818
#export MDB_SEARCH_COMMUNITY_VERSION="b9b80915f5571bfa5fc2aa70acb20d784e68d79b" # hardcoded Local->Admin, handled replicaSetName in config
19+
export MDB_SEARCH_COMMUNITY_VERSION="fbd60fb055dd500058edcb45677ea85d19421f47" # Nolan's fixes
1920
export MDB_SEARCH_COMMUNITY_NAME="mongot/community"
2021
export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"

0 commit comments

Comments
 (0)