diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index ce5ce623d..3c463f2ba 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -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" diff --git a/controllers/operator/mongodbsearch_controller_test.go b/controllers/operator/mongodbsearch_controller_test.go index 93e9f4abf..7e498a8df 100644 --- a/controllers/operator/mongodbsearch_controller_test.go +++ b/controllers/operator/mongodbsearch_controller_test.go @@ -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{ diff --git a/controllers/search_controller/mongodbsearch_reconcile_helper.go b/controllers/search_controller/mongodbsearch_reconcile_helper.go index 6c80806e4..fa7bd677c 100644 --- a/controllers/search_controller/mongodbsearch_reconcile_helper.go +++ b/controllers/search_controller/mongodbsearch_reconcile_helper.go @@ -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{ diff --git a/docker/mongodb-kubernetes-tests/tests/common/search/movies_search_helper.py b/docker/mongodb-kubernetes-tests/tests/common/search/movies_search_helper.py index 807d97493..be2151158 100644 --- a/docker/mongodb-kubernetes-tests/tests/common/search/movies_search_helper.py +++ b/docker/mongodb-kubernetes-tests/tests/common/search/movies_search_helper.py @@ -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 diff --git a/helm_chart/values.yaml b/helm_chart/values.yaml index 2a7a85706..ebb8bd1c4 100644 --- a/helm_chart/values.yaml +++ b/helm_chart/values.yaml @@ -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 diff --git a/mongodb-community-operator/pkg/mongot/mongot_config.go b/mongodb-community-operator/pkg/mongot/mongot_config.go index 2cd1b5da5..c8126b173 100644 --- a/mongodb-community-operator/pkg/mongot/mongot_config.go +++ b/mongodb-community-operator/pkg/mongot/mongot_config.go @@ -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 { diff --git a/public/mongodb-kubernetes-multi-cluster.yaml b/public/mongodb-kubernetes-multi-cluster.yaml index a83643211..b0372a6fd 100644 --- a/public/mongodb-kubernetes-multi-cluster.yaml +++ b/public/mongodb-kubernetes-multi-cluster.yaml @@ -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: diff --git a/public/mongodb-kubernetes-openshift.yaml b/public/mongodb-kubernetes-openshift.yaml index cfe6359ca..da2a95730 100644 --- a/public/mongodb-kubernetes-openshift.yaml +++ b/public/mongodb-kubernetes-openshift.yaml @@ -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" diff --git a/public/mongodb-kubernetes.yaml b/public/mongodb-kubernetes.yaml index 16406a9da..2875cdd81 100644 --- a/public/mongodb-kubernetes.yaml +++ b/public/mongodb-kubernetes.yaml @@ -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" diff --git a/scripts/dev/contexts/e2e_mdb_community b/scripts/dev/contexts/e2e_mdb_community index 71429c016..bc2f0f7f0 100644 --- a/scripts/dev/contexts/e2e_mdb_community +++ b/scripts/dev/contexts/e2e_mdb_community @@ -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"