expand on the wireproto override

Author: fealebenpae

api/v1/search/mongodbsearch_types.go

@@ -249,7 +249,17 @@ func (s *MongoDBSearch) GetLogLevel() mdb.LogLevel {
 	return s.Spec.LogLevel
 }
 
-func (s *MongoDBSearch) IsWireprotoForced() bool {
+// mongot configuration defaults to the gRPC server. on rare occasions we might advise users to enable the legacy
+// wireproto server. Once the deprecated wireproto server is removed, this function, annotation, and all code guarded
+// by this check should be removed.
+func (s *MongoDBSearch) IsWireprotoEnabled() bool {
 	val, ok := s.Annotations[ForceWireprotoTransportAnnotation]
 	return ok && val == "true"
 }
+
+func (s *MongoDBSearch) GetEffectiveMongotPort() int32 {
+	if s.IsWireprotoEnabled() {
+		return s.GetMongotWireprotoPort()
+	}
+	return s.GetMongotGrpcPort()
+}

controllers/operator/mongodbsearch_controller.go

@@ -57,7 +57,7 @@ func (r *MongoDBSearchReconciler) Reconcile(ctx context.Context, request reconci
 		return reconcile.Result{RequeueAfter: time.Second * util.RetryTimeSec}, err
 	}
 
-	if mdbSearch.IsWireprotoForced() {
+	if mdbSearch.IsWireprotoEnabled() {
 		log.Info("Enabling the mongot wireproto server as required by annotation")
 		// the keyfile secret is necessary for wireproto authentication
 		r.watch.AddWatchedResourceIfNotAdded(searchSource.KeyfileSecretName(), mdbSearch.Namespace, watch.Secret, mdbSearch.NamespacedName())

controllers/operator/mongodbsearch_controller_test.go

@@ -103,7 +103,7 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 	}
 
 	var wireprotoServer *mongot.ConfigWireproto
-	if search.IsWireprotoForced() {
+	if search.IsWireprotoEnabled() {
 		wireprotoServer = &mongot.ConfigWireproto{
 			Address: fmt.Sprintf("0.0.0.0:%d", search.GetMongotWireprotoPort()),
 			Authentication: &mongot.ConfigAuthentication{

controllers/searchcontroller/mongodbsearch_reconcile_helper.go

@@ -98,7 +98,7 @@ func (r *MongoDBSearchReconcileHelper) reconcile(ctx context.Context, log *zap.S
 	}
 
 	keyfileStsModification := statefulset.NOOP()
-	if r.mdbSearch.IsWireprotoForced() {
+	if r.mdbSearch.IsWireprotoEnabled() {
 		var err error
 		keyfileStsModification, err = r.ensureSourceKeyfile(ctx, log)
 		if apierrors.IsNotFound(err) {
@@ -317,7 +317,7 @@ func buildSearchHeadlessService(search *searchv1.MongoDBSearch) corev1.Service {
 		SetPublishNotReadyAddresses(true).
 		SetOwnerReferences(search.GetOwnerReferences())
 
-	if search.IsWireprotoForced() {
+	if search.IsWireprotoEnabled() {
 		serviceBuilder.AddPort(&corev1.ServicePort{
 			Name:       "mongot-wireproto",
 			Protocol:   corev1.ProtocolTCP,
@@ -375,7 +375,7 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
 				},
 			},
 		}
-		if search.IsWireprotoForced() {
+		if search.IsWireprotoEnabled() {
 			config.Server.Wireproto = &mongot.ConfigWireproto{
 				Address: fmt.Sprintf("0.0.0.0:%d", search.GetMongotWireprotoPort()),
 				Authentication: &mongot.ConfigAuthentication{
@@ -413,17 +413,14 @@ func GetMongodConfigParameters(search *searchv1.MongoDBSearch, clusterDomain str
 			"searchIndexManagementHostAndPort":                mongotHostAndPort(search, clusterDomain),
 			"skipAuthenticationToSearchIndexManagementServer": false,
 			"searchTLSMode":                                   string(searchTLSMode),
-			"useGrpcForSearch":                                !search.IsWireprotoForced(),
+			"useGrpcForSearch":                                !search.IsWireprotoEnabled(),
 		},
 	}
 }
 
 func mongotHostAndPort(search *searchv1.MongoDBSearch, clusterDomain string) string {
 	svcName := search.SearchServiceNamespacedName()
-	port := search.GetMongotGrpcPort()
-	if search.IsWireprotoForced() {
-		port = search.GetMongotWireprotoPort()
-	}
+	port := search.GetEffectiveMongotPort()
 	return fmt.Sprintf("%s.%s.svc.%s:%d", svcName.Name, svcName.Namespace, clusterDomain, port)
 }