Adjusted schema syntax for optionals

Author: lsierant

controllers/operator/mongodbsearch_controller_test.go

@@ -3,6 +3,7 @@ package operator
 import (
 	"context"
 	"fmt"
+	"k8s.io/utils/ptr"
 	"testing"
 
 	"github.com/ghodss/yaml"
@@ -79,17 +80,17 @@ func buildExpectedMongotConfig(search *searchv1.MongoDBSearch, mdbc *mdbcv1.Mong
 				HostAndPort:    fmt.Sprintf("%s.%s.svc.cluster.local:%d", mdbc.Name+"-svc", search.Namespace, 27017),
 				Username:       "__system",
 				PasswordFile:   "/tmp/keyfile",
-				TLS:            false,
-				ReadPreference: "secondaryPreferred",
+				TLS:            ptr.To(false),
+				ReadPreference: ptr.To("secondaryPreferred"),
 			},
 		},
 		Storage: mongot.ConfigStorage{
 			DataPath: "/mongot/data/config.yml",
 		},
 		Server: mongot.ConfigServer{
-			Wireproto: mongot.ConfigWireproto{
+			Wireproto: &mongot.ConfigWireproto{
 				Address: "0.0.0.0:27027",
-				Authentication: mongot.ConfigAuthentication{
+				Authentication: &mongot.ConfigAuthentication{
 					Mode:    "keyfile",
 					KeyFile: "/tmp/keyfile",
 				},

controllers/search_controller/mongodbsearch_reconcile_helper.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"encoding/base32"
 	"fmt"
+	"k8s.io/utils/ptr"
 	"strings"
 
 	"github.com/blang/semver"
@@ -210,21 +211,20 @@ func createMongotConfig(search *searchv1.MongoDBSearch, db SearchSourceDBResourc
 	return mongot.Config{
 		SyncSource: mongot.ConfigSyncSource{
 			ReplicaSet: mongot.ConfigReplicaSet{
-				HostAndPort:  fmt.Sprintf("%s.%s.svc.cluster.local:%d", db.DatabaseServiceName(), db.GetNamespace(), db.DatabasePort()),
-				Username:     "__system",
-				PasswordFile: "/tmp/keyfile",
-				TLS:          false,
-				// TODO check
-				ReadPreference: "secondaryPreferred",
+				HostAndPort:    fmt.Sprintf("%s.%s.svc.cluster.local:%d", db.DatabaseServiceName(), db.GetNamespace(), db.DatabasePort()),
+				Username:       "__system",
+				PasswordFile:   "/tmp/keyfile",
+				TLS:            ptr.To(false),
+				ReadPreference: ptr.To("secondaryPreferred"),
 			},
 		},
 		Storage: mongot.ConfigStorage{
 			DataPath: "/mongot/data/config.yml",
 		},
 		Server: mongot.ConfigServer{
-			Wireproto: mongot.ConfigWireproto{
+			Wireproto: &mongot.ConfigWireproto{
 				Address: "0.0.0.0:27027",
-				Authentication: mongot.ConfigAuthentication{
+				Authentication: &mongot.ConfigAuthentication{
 					Mode:    "keyfile",
 					KeyFile: "/tmp/keyfile",
 				},

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

@@ -14,34 +14,42 @@ type ConfigSyncSource struct {
 }
 
 type ConfigReplicaSet struct {
-	HostAndPort    string `json:"hostAndPort"`
-	Username       string `json:"username"`
-	PasswordFile   string `json:"passwordFile"`
-	TLS            bool   `json:"tls"`
-	ReadPreference string `json:"readPreference"`
+	HostAndPort    string  `json:"hostAndPort"`
+	Username       string  `json:"username"`
+	PasswordFile   string  `json:"passwordFile"`
+	TLS            *bool   `json:"tls,omitempty"`
+	ReadPreference *string `json:"readPreference,omitempty"`
 }
 
 type ConfigStorage struct {
 	DataPath string `json:"dataPath"`
 }
 
 type ConfigServer struct {
-	Wireproto ConfigWireproto `json:"wireproto"`
+	Wireproto *ConfigWireproto `json:"wireproto,omitempty"`
 }
 
 type ConfigWireproto struct {
-	Address        string               `json:"address"`
-	Authentication ConfigAuthentication `json:"authentication"`
-	TLS            ConfigTLS            `json:"tls"`
+	Address        string                `json:"address"`
+	Authentication *ConfigAuthentication `json:"authentication,omitempty"`
+	TLS            ConfigTLS             `json:"tls"`
 }
 
 type ConfigAuthentication struct {
 	Mode    string `json:"mode"`
 	KeyFile string `json:"keyFile"`
 }
 
+type ConfigTLSMode string
+
+const (
+	ConfigTLSModeTLS      ConfigTLSMode = "TLS"
+	ConfigTLSModeDisabled ConfigTLSMode = "Disabled"
+)
+
 type ConfigTLS struct {
-	Mode string `json:"mode"`
+	Mode               ConfigTLSMode `json:"mode"`
+	CertificateKeyFile *string       `json:"certificateKeyFile,omitempty"`
 }
 
 type ConfigMetrics struct {