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{

controllers/search_controller/search_construction.go

@@ -195,10 +195,7 @@ cp /mongot/sourceUserPassword/password /tmp/sourceUserPassword
 chown 2000:2000 /tmp/sourceUserPassword
 chmod 0600 /tmp/sourceUserPassword
 
-if ! /mongot-community/mongot --config /mongot/config/config.yml; then
-	echo "mongot error code, sleeping to allow to ssh"
-	sleep 600
-fi
+/mongot-community/mongot --config /mongot/config/config.yml
 `,
 		}),
 		containerSecurityContext,

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}")

docker/mongodb-kubernetes-tests/tests/opsmanager/withMonitoredAppDB/om_appdb_scale_up_down.py

@@ -2,6 +2,7 @@
 
 import pytest
 from kubetester.kubetester import fixture as yaml_fixture
+from kubetester.kubetester import skip_if_local
 from kubetester.opsmanager import MongoDBOpsManager
 from kubetester.phase import Phase
 from pytest import fixture
@@ -64,6 +65,7 @@ def test_appdb_monitoring_group_was_created(self, ops_manager: MongoDBOpsManager
     def test_admin_config_map(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_automation_config_tester().reached_version(1)
 
+    @skip_if_local
     def test_om_connectivity(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_om_tester().assert_healthiness()
         # todo check the backing db group, automation config and data integrity
@@ -110,6 +112,7 @@ def test_appdb(self, ops_manager: MongoDBOpsManager, custom_appdb_version: str):
     def test_admin_config_map(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_automation_config_tester().reached_version(2)
 
+    @skip_if_local
     def test_om_connectivity(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_om_tester().assert_healthiness()
 
@@ -136,5 +139,6 @@ def test_appdb(self, ops_manager: MongoDBOpsManager):
     def test_admin_config_map(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_automation_config_tester().reached_version(3)
 
+    @skip_if_local
     def test_om_connectivity(self, ops_manager: MongoDBOpsManager):
         ops_manager.get_om_tester().assert_healthiness()

docker/mongodb-kubernetes-tests/tests/search/search_community_basic.py

@@ -104,9 +104,9 @@ def test_search_create_search_index(sample_movies_helper: SampleMoviesSearchHelp
     sample_movies_helper.create_search_index()
 
 
-# @mark.e2e_search_community_basic
-# def test_search_wait_for_search_indexes(sample_movies_helper: SampleMoviesSearchHelper):
-#     sample_movies_helper.wait_for_search_indexes()
+@mark.e2e_search_community_basic
+def test_search_wait_for_search_indexes(sample_movies_helper: SampleMoviesSearchHelper):
+    sample_movies_helper.wait_for_search_indexes()
 
 
 @mark.e2e_search_community_basic

helm_chart/values.yaml

@@ -226,7 +226,7 @@ search:
 #    name: mongodb-search-community
 #    # 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
+    repo: 268558157000.dkr.ecr.eu-west-1.amazonaws.com/dev
+    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"