Merge branch 'master' into fix/mk-smoke-tests

Author: MaciejKaras

.evergreen-tasks.yml

@@ -1235,3 +1235,8 @@ tasks:
     tags: [ "patch-run" ]
     commands:
       - func: e2e_test
+
+  - name: e2e_search_community_basic
+    tags: ["patch-run"]
+    commands:
+      - func: "e2e_test"

.evergreen.yml

@@ -618,6 +618,7 @@ task_groups:
     <<: *setup_and_teardown_task
     tasks:
       - e2e_community_replicaset_scale
+      - e2e_search_community_basic
 
   # This is the task group that contains all the tests run in the e2e_mdb_kind_ubuntu_cloudqa build variant
   - name: e2e_mdb_kind_cloudqa_task_group
@@ -1187,7 +1188,7 @@ buildvariants:
   # where <distro> is any of ubuntu|ubi
   # where <om_version> denotes the OM version tested (e.g. om50, om60, cloudqa) - used only for MDB tests
 
-  ## MongoDBCommunity build variant
+  # MongoDBCommunity build variant
   - name: e2e_mdb_community
     display_name: e2e_mdb_community
     tags: [ "e2e_test_suite"]

RELEASE_NOTES.md

@@ -1,7 +1,20 @@
 [//]: # (Consider renaming or removing the header for next release, otherwise it appears as duplicate in the published release, e.g: https://github.com/mongodb/mongodb-enterprise-kubernetes/releases/tag/1.22.0 )
 <!-- Next Release -->
 
-# MCK 1.0 Release Notes
+# MCK 1.1.0 Release Notes
+
+## New Features
+
+* **MongoDBSearch (Community Private Preview)**: Added support for deploying MongoDB Search (Community Private Preview Edition) that enables full-text and vector search capabilities for MongoDBCommunity deployments.
+  * Added new MongoDB CRD which is watched by default by the operator.
+    * For more information please see: `TBD LINK TO DOC MARKDOWN`
+  * Private Preview phase comes with some limitations:
+    * minimum MongoDB Community version: 8.0.
+    * TLS must be disabled in MongoDB (communication between mongot and mongod is in plaintext for now).
+
+<!-- Past Releases -->
+
+# MCK 1.0.0 Release Notes
 
 Exciting news for MongoDB on Kubernetes\! We're happy to announce the first release of MongoDB Controllers for Kubernetes (MCK), a unified open-source operator merging our support of MongoDB Community and Enterprise in Kubernetes.
 

api/v1/search/doc.go

@@ -0,0 +1,4 @@
+package search
+
+// +k8s:deepcopy-gen=package
+// +versionName=v1

api/v1/search/groupversion_info.go

@@ -0,0 +1,20 @@
+// Package v1 contains API Schema definitions for the mongodb v1 API group
+// +kubebuilder:object:generate=true
+// +groupName=mongodb.com
+package search
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"sigs.k8s.io/controller-runtime/pkg/scheme"
+)
+
+var (
+	// GroupVersion is group version used to register these objects
+	GroupVersion = schema.GroupVersion{Group: "mongodb.com", Version: "v1"}
+
+	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
+	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+
+	// AddToScheme adds the types in this group-version to the given scheme.
+	AddToScheme = SchemeBuilder.AddToScheme
+)

api/v1/search/mongodbsearch_types.go

@@ -0,0 +1,136 @@
+package search
+
+import (
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
+
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	v1 "github.com/mongodb/mongodb-kubernetes/api/v1"
+	"github.com/mongodb/mongodb-kubernetes/api/v1/status"
+	userv1 "github.com/mongodb/mongodb-kubernetes/api/v1/user"
+	"github.com/mongodb/mongodb-kubernetes/mongodb-community-operator/api/v1/common"
+)
+
+const (
+	MongotDefaultPort        = 27027
+	MongotDefaultMetricsPort = 9946
+)
+
+func init() {
+	v1.SchemeBuilder.Register(&MongoDBSearch{}, &MongoDBSearchList{})
+}
+
+type MongoDBSearchSpec struct {
+	// +optional
+	Version string `json:"version"`
+	// +optional
+	Source *MongoDBSource `json:"source"`
+	// +optional
+	StatefulSetConfiguration *common.StatefulSetConfiguration `json:"statefulSet,omitempty"`
+	// +optional
+	Persistence *common.Persistence `json:"persistence,omitempty"`
+	// +optional
+	ResourceRequirements *corev1.ResourceRequirements `json:"resourceRequirements,omitempty"`
+}
+
+type MongoDBSource struct {
+	// +optional
+	MongoDBResourceRef *userv1.MongoDBResourceRef `json:"mongodbResourceRef,omitempty"`
+}
+
+type MongoDBSearchStatus struct {
+	status.Common `json:",inline"`
+	Version       string           `json:"version,omitempty"`
+	Warnings      []status.Warning `json:"warnings,omitempty"`
+}
+
+// +k8s:deepcopy-gen=true
+// +kubebuilder:object:root=true
+// +k8s:openapi-gen=true
+// +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase",description="Current state of the MongoDB deployment."
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="The time since the MongoDB resource was created."
+// +kubebuilder:resource:path=mongodbsearch,scope=Namespaced,shortName=mdbs
+type MongoDBSearch struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec MongoDBSearchSpec `json:"spec"`
+	// +optional
+	Status MongoDBSearchStatus `json:"status,omitempty"`
+}
+
+// +k8s:deepcopy-gen=true
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+type MongoDBSearchList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []MongoDBSearch `json:"items"`
+}
+
+func (s *MongoDBSearch) GetCommonStatus(options ...status.Option) *status.Common {
+	return &s.Status.Common
+}
+
+func (s *MongoDBSearch) GetStatus(...status.Option) interface{} {
+	return s.Status
+}
+
+func (s *MongoDBSearch) GetStatusPath(...status.Option) string {
+	return "/status"
+}
+
+func (s *MongoDBSearch) SetWarnings(warnings []status.Warning, _ ...status.Option) {
+	s.Status.Warnings = warnings
+}
+
+func (s *MongoDBSearch) UpdateStatus(phase status.Phase, statusOptions ...status.Option) {
+	s.Status.UpdateCommonFields(phase, s.GetGeneration(), statusOptions...)
+	if option, exists := status.GetOption(statusOptions, status.WarningsOption{}); exists {
+		s.Status.Warnings = append(s.Status.Warnings, option.(status.WarningsOption).Warnings...)
+	}
+}
+
+func (s *MongoDBSearch) NamespacedName() types.NamespacedName {
+	return types.NamespacedName{Name: s.Name, Namespace: s.Namespace}
+}
+
+func (s *MongoDBSearch) SearchServiceNamespacedName() types.NamespacedName {
+	return types.NamespacedName{Name: s.Name + "-search-svc", Namespace: s.Namespace}
+}
+
+func (s *MongoDBSearch) MongotConfigConfigMapNamespacedName() types.NamespacedName {
+	return types.NamespacedName{Name: s.Name + "-search-config", Namespace: s.Namespace}
+}
+
+func (s *MongoDBSearch) StatefulSetNamespacedName() types.NamespacedName {
+	return types.NamespacedName{Name: s.Name + "-search", Namespace: s.Namespace}
+}
+
+func (s *MongoDBSearch) GetOwnerReferences() []metav1.OwnerReference {
+	ownerReference := *metav1.NewControllerRef(s, schema.GroupVersionKind{
+		Group:   GroupVersion.Group,
+		Version: GroupVersion.Version,
+		Kind:    s.Kind,
+	})
+	return []metav1.OwnerReference{ownerReference}
+}
+
+func (s *MongoDBSearch) GetMongoDBResourceRef() userv1.MongoDBResourceRef {
+	mdbResourceRef := userv1.MongoDBResourceRef{Namespace: s.Namespace, Name: s.Name}
+	if s.Spec.Source != nil && s.Spec.Source.MongoDBResourceRef != nil && s.Spec.Source.MongoDBResourceRef.Name != "" {
+		mdbResourceRef.Name = s.Spec.Source.MongoDBResourceRef.Name
+	}
+
+	return mdbResourceRef
+}
+
+func (s *MongoDBSearch) GetMongotPort() int32 {
+	return MongotDefaultPort
+}
+
+func (s *MongoDBSearch) GetMongotMetricsPort() int32 {
+	return MongotDefaultMetricsPort
+}