wip

Author: lsierant

controllers/operator/mongodbsearch_controller_test.go

@@ -78,10 +78,11 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 		SyncSource: mongot.ConfigSyncSource{
 			ReplicaSet: mongot.ConfigReplicaSet{
 				HostAndPort:    fmt.Sprintf("%s.%s.svc.cluster.local:%d", mdbc.Name+"-svc", search.Namespace, 27017),
-				Username:       "__system",
-				PasswordFile:   "/tmp/keyfile",
+				Username:       "mongot-user",
+				PasswordFile:   "/tmp/sourceUserPassword",
 				TLS:            ptr.To(false),
 				ReadPreference: ptr.To("secondaryPreferred"),
+				ReplicaSetName: "mdb",
 			},
 		},
 		Storage: mongot.ConfigStorage{
@@ -105,7 +106,7 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 			Address: "0.0.0.0:8080",
 		},
 		Logging: mongot.ConfigLogging{
-			Verbosity: "DEBUG",
+			Verbosity: "TRACE",
 			LogPath:   nil,
 		},
 	}

controllers/search_controller/mongodbsearch_reconcile_helper.go

@@ -216,6 +216,7 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
 				PasswordFile:   "/tmp/sourceUserPassword",
 				TLS:            ptr.To(false),
 				ReadPreference: ptr.To("secondaryPreferred"),
+				ReplicaSetName: db.Name(),
 			},
 		},
 		Storage: mongot.ConfigStorage{

docker/mongodb-kubernetes-tests/kubetester/helm.py

@@ -120,8 +120,8 @@ def helm_repo_add(repo_name: str, url: str):
 
 
 def process_run_and_check(args, **kwargs):
-    if 'check' not in kwargs:
-        kwargs['check'] = True
+    if "check" not in kwargs:
+        kwargs["check"] = True
 
     try:
         logger.debug(f"subprocess.run: {args}")

helm_chart/values.yaml

@@ -227,6 +227,6 @@ search:
 #    # default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
 #    version: 1.47.0
     repo: 268558157000.dkr.ecr.us-east-1.amazonaws.com/dev
-    name: mongodb-search-community
+    name: mongot/community
     # default MongoDB Search version used; can be overridden by setting MongoDBSearch.spec.version field.
-    version: 1.47.0
+    version: b9b80915f5571bfa5fc2aa70acb20d784e68d79b

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

@@ -17,6 +17,7 @@ type ConfigReplicaSet struct {
 	HostAndPort    string  `json:"hostAndPort"`
 	Username       string  `json:"username"`
 	PasswordFile   string  `json:"passwordFile"`
+	ReplicaSetName string  `json:"replicaSetName"`
 	TLS            *bool   `json:"tls,omitempty"`
 	ReadPreference *string `json:"readPreference,omitempty"`
 }

scripts/dev/contexts/e2e_mdb_community

@@ -14,6 +14,7 @@ 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="ad8acf5c3a045d6e0306ad67d61fcb5be40f57ae" # hardcoded mdbc-rs replicaset name
+#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_NAME="mongot/community"
 export MDB_SEARCH_COMMUNITY_REPO_URL="268558157000.dkr.ecr.eu-west-1.amazonaws.com"