Skip to content

Commit 18ea4ab

Browse files
authored
Using auth source and (#285)
# Summary Handled recent fixes to auth db and replicaset connection in mongot. <!-- start git-machete generated --> ## Chain of upstream PRs as of 2025-07-22 * PR #229: `master` ← `search/public-preview` * **PR #285 (THIS ONE)**: `search/public-preview` ← `lsierant/auth-source` <!-- end git-machete generated -->
1 parent 5d44ddc commit 18ea4ab

File tree

10 files changed

+16
-13
lines changed

10 files changed

+16
-13
lines changed

config/manager/manager.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,10 +392,10 @@ spec:
392392
- name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
393393
value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
394394
- name: RELATED_IMAGE_MDB_SEARCH_IMAGE_1_47_0
395-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-search-community:1.47.0"
395+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot/community:1.47.0"
396396
- name: MDB_SEARCH_COMMUNITY_REPO_URL
397-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
397+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
398398
- name: MDB_SEARCH_COMMUNITY_NAME
399-
value: "mongodb-search-community"
399+
value: "mongot/community"
400400
- name: MDB_SEARCH_COMMUNITY_VERSION
401401
value: "1.47.0"

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{

docker/mongodb-kubernetes-tests/tests/common/search/movies_search_helper.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import logging
22

33
import pymongo.errors
4-
54
from kubetester import kubetester
65
from tests import test_logger
76
from tests.common.search.search_tester import SearchTester

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: 1.47.0

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 {

public/mongodb-kubernetes-multi-cluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,9 +432,9 @@ spec:
432432
value: "ubi8"
433433
# Community Env Vars End
434434
- name: MDB_SEARCH_COMMUNITY_REPO_URL
435-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
435+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
436436
- name: MDB_SEARCH_COMMUNITY_NAME
437-
value: "mongodb-search-community"
437+
value: "mongot/community"
438438
- name: MDB_SEARCH_COMMUNITY_VERSION
439439
value: "1.47.0"
440440
volumes:

public/mongodb-kubernetes-openshift.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -696,10 +696,10 @@ spec:
696696
- name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
697697
value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
698698
- name: RELATED_IMAGE_MDB_SEARCH_IMAGE_1_47_0
699-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-search-community:1.47.0"
699+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot/community:1.47.0"
700700
- name: MDB_SEARCH_COMMUNITY_REPO_URL
701-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
701+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
702702
- name: MDB_SEARCH_COMMUNITY_NAME
703-
value: "mongodb-search-community"
703+
value: "mongot/community"
704704
- name: MDB_SEARCH_COMMUNITY_VERSION
705705
value: "1.47.0"

public/mongodb-kubernetes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,8 @@ spec:
428428
value: "ubi8"
429429
# Community Env Vars End
430430
- name: MDB_SEARCH_COMMUNITY_REPO_URL
431-
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
431+
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
432432
- name: MDB_SEARCH_COMMUNITY_NAME
433-
value: "mongodb-search-community"
433+
value: "mongot/community"
434434
- name: MDB_SEARCH_COMMUNITY_VERSION
435435
value: "1.47.0"

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)