Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,10 @@ spec:
- name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
- name: RELATED_IMAGE_MDB_SEARCH_IMAGE_1_47_0
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-search-community:1.47.0"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot/community:1.47.0"
- name: MDB_SEARCH_COMMUNITY_REPO_URL
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
- name: MDB_SEARCH_COMMUNITY_NAME
value: "mongodb-search-community"
value: "mongot/community"
- name: MDB_SEARCH_COMMUNITY_VERSION
value: "1.47.0"
1 change: 1 addition & 0 deletions controllers/operator/mongodbsearch_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
PasswordFile: "/tmp/sourceUserPassword",
TLS: ptr.To(false),
ReadPreference: ptr.To("secondaryPreferred"),
AuthSource: ptr.To("admin"),
},
},
Storage: mongot.ConfigStorage{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
PasswordFile: "/tmp/sourceUserPassword",
TLS: ptr.To(false),
ReadPreference: ptr.To("secondaryPreferred"),
AuthSource: ptr.To("admin"),
},
}
config.Storage = mongot.ConfigStorage{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import logging

import pymongo.errors

from kubetester import kubetester
from tests import test_logger
from tests.common.search.search_tester import SearchTester
Expand Down
2 changes: 1 addition & 1 deletion helm_chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,4 @@ search:
repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com
name: mongot/community
# default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
version: d6884ae132aab30497af55dbaff05e8274e9775f
version: 1.47.0
1 change: 1 addition & 0 deletions mongodb-community-operator/pkg/mongot/mongot_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type ConfigReplicaSet struct {
PasswordFile string `json:"passwordFile"`
TLS *bool `json:"tls,omitempty"`
ReadPreference *string `json:"readPreference,omitempty"`
AuthSource *string `json:"authSource,omitempty"`
}

type ConfigStorage struct {
Expand Down
4 changes: 2 additions & 2 deletions public/mongodb-kubernetes-multi-cluster.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -432,9 +432,9 @@ spec:
value: "ubi8"
# Community Env Vars End
- name: MDB_SEARCH_COMMUNITY_REPO_URL
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
- name: MDB_SEARCH_COMMUNITY_NAME
value: "mongodb-search-community"
value: "mongot/community"
- name: MDB_SEARCH_COMMUNITY_VERSION
value: "1.47.0"
volumes:
Expand Down
6 changes: 3 additions & 3 deletions public/mongodb-kubernetes-openshift.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,10 @@ spec:
- name: RELATED_IMAGE_MONGODB_IMAGE_8_0_0_ubi9
value: "quay.io/mongodb/mongodb-enterprise-server:8.0.0-ubi9"
- name: RELATED_IMAGE_MDB_SEARCH_IMAGE_1_47_0
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev/mongodb-search-community:1.47.0"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com/mongot/community:1.47.0"
- name: MDB_SEARCH_COMMUNITY_REPO_URL
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
- name: MDB_SEARCH_COMMUNITY_NAME
value: "mongodb-search-community"
value: "mongot/community"
- name: MDB_SEARCH_COMMUNITY_VERSION
value: "1.47.0"
4 changes: 2 additions & 2 deletions public/mongodb-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ spec:
value: "ubi8"
# Community Env Vars End
- name: MDB_SEARCH_COMMUNITY_REPO_URL
value: "268558157000.dkr.ecr.us-east-1.amazonaws.com/dev"
value: "268558157000.dkr.ecr.eu-west-1.amazonaws.com"
- name: MDB_SEARCH_COMMUNITY_NAME
value: "mongodb-search-community"
value: "mongot/community"
- name: MDB_SEARCH_COMMUNITY_VERSION
value: "1.47.0"
3 changes: 2 additions & 1 deletion scripts/dev/contexts/e2e_mdb_community
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ export OM_EXTERNALLY_CONFIGURED="true"

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