Merge branch 'master' into lsierant/archive-snippets-fixes

Author: anandsyncs

.evergreen-functions.yml

@@ -524,6 +524,8 @@ functions:
   download_multi_cluster_binary:
     - command: subprocess.exec
       params:
+        include_expansions_in_env:
+          - workdir
         working_dir: src/github.com/mongodb/mongodb-kubernetes
         binary: scripts/release/kubectl_mongodb/download_kubectl_plugin.sh
         env:
@@ -791,6 +793,8 @@ functions:
           - code_snippets_reset
           - task_name
           - MDB_BASH_DEBUG
+        add_to_path:
+          - ${workdir}/bin
         script: |
           ./scripts/code_snippets/tests/${task_name}
 

.evergreen.yml

@@ -13,9 +13,9 @@ include:
 variables:
   - &ops_manager_60_latest 6.0.27 # The order/index is important, since these are anchors. Please do not change
 
-  - &ops_manager_70_latest 7.0.18 # The order/index is important, since these are anchors. Please do not change
+  - &ops_manager_70_latest 7.0.19 # The order/index is important, since these are anchors. Please do not change
 
-  - &ops_manager_80_latest 8.0.15 # The order/index is important, since these are anchors. Please do not change
+  - &ops_manager_80_latest 8.0.16 # The order/index is important, since these are anchors. Please do not change
 
   # The dependency unification between static and non-static is intentional here.
   # Even though some images are exclusive, in EVG they all are built once and in parallel.

.gitignore

@@ -94,3 +94,5 @@ logs
 
 # locally packaged chart
 mongodb-kubernetes-*.tgz
+
+scripts/code_snippets/tests/outputs/*

api/v1/mdb/mongodb_roles_validation.go

@@ -246,7 +246,7 @@ func validatePrivilege(privilege Privilege, mdbVersion string) v1.ValidationResu
 		if !*privilege.Resource.Cluster {
 			return v1.ValidationError("The only valid value for privilege.cluster, if set, is true")
 		}
-		if privilege.Resource.Collection != "" || privilege.Resource.Db != "" {
+		if privilege.Resource.Collection != nil || privilege.Resource.Db != nil {
 			return v1.ValidationError("Cluster: true is not compatible with setting db/collection")
 		}
 		if res := validateClusterPrivilegeActions(privilege.Actions, mdbVersion); res.Level == v1.ErrorLevel {

api/v1/mdb/mongodb_types.go

@@ -965,10 +965,10 @@ type AuthenticationRestriction struct {
 
 type Resource struct {
 	// +optional
-	Db string `json:"db"`
+	Db *string `json:"db,omitempty"`
 	// +optional
-	Collection string `json:"collection"`
-	Cluster    *bool  `json:"cluster,omitempty"`
+	Collection *string `json:"collection,omitempty"`
+	Cluster    *bool   `json:"cluster,omitempty"`
 }
 
 type Privilege struct {

api/v1/search/mongodbsearch_types.go

@@ -105,6 +105,7 @@ type MongoDBSearchStatus struct {
 // +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="Version",type="string",JSONPath=".status.version",description="MongoDB Search version reconciled by the operator."
 // +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 {
@@ -145,6 +146,9 @@ func (s *MongoDBSearch) UpdateStatus(phase status.Phase, statusOptions ...status
 	if option, exists := status.GetOption(statusOptions, status.WarningsOption{}); exists {
 		s.Status.Warnings = append(s.Status.Warnings, option.(status.WarningsOption).Warnings...)
 	}
+	if option, exists := status.GetOption(statusOptions, MongoDBSearchVersionOption{}); exists {
+		s.Status.Version = option.(MongoDBSearchVersionOption).Version
+	}
 }
 
 func (s *MongoDBSearch) NamespacedName() types.NamespacedName {

api/v1/search/status_options.go

@@ -0,0 +1,17 @@
+package search
+
+import "github.com/mongodb/mongodb-kubernetes/api/v1/status"
+
+type MongoDBSearchVersionOption struct {
+	Version string
+}
+
+var _ status.Option = MongoDBSearchVersionOption{}
+
+func NewMongoDBSearchVersionOption(version string) MongoDBSearchVersionOption {
+	return MongoDBSearchVersionOption{Version: version}
+}
+
+func (o MongoDBSearchVersionOption) Value() interface{} {
+	return o.Version
+}

changelog/20251024_fix_mongodbsearch_status_version.md

@@ -0,0 +1,7 @@
+---
+title: Surface reconciled MongoDBSearch version
+kind: fix
+date: 2025-10-24
+---
+
+* MongoDBSearch now records the reconciled mongot version in status and exposes it via a dedicated kubectl print column.

changelog/20251027_fix_cloudp_350197_allow_to_create_a_custom_role_with.md

@@ -0,0 +1,6 @@
+---
+kind: fix
+date: 2025-10-27
+---
+
+* Fixed inability to specify cluster-wide privileges in custom roles.

config/manager/manager.yaml

@@ -140,6 +140,8 @@ spec:
               value: "quay.io/mongodb/mongodb-agent:107.0.17.8771-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_107_0_18_8784_1
               value: "quay.io/mongodb/mongodb-agent:107.0.18.8784-1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_107_0_19_8805_1
+              value: "quay.io/mongodb/mongodb-agent:107.0.19.8805-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_1_8718_1
               value: "quay.io/mongodb/mongodb-agent:108.0.1.8718-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_11_8830_1
@@ -150,6 +152,8 @@ spec:
               value: "quay.io/mongodb/mongodb-agent:108.0.13.8870-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_15_8888_1
               value: "quay.io/mongodb/mongodb-agent:108.0.15.8888-1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_108_0_16_8895_1
+              value: "quay.io/mongodb/mongodb-agent:108.0.16.8895-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_2_8729_1
               value: "quay.io/mongodb/mongodb-agent:108.0.2.8729-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_108_0_3_8758_1
@@ -162,8 +166,8 @@ spec:
               value: "quay.io/mongodb/mongodb-agent:108.0.7.8810-1"
             - name: RELATED_IMAGE_AGENT_IMAGE_12_0_35_7911_1
               value: "quay.io/mongodb/mongodb-agent:12.0.35.7911-1"
-            - name: RELATED_IMAGE_AGENT_IMAGE_13_41_0_9830_1
-              value: "quay.io/mongodb/mongodb-agent:13.41.0.9830-1"
+            - name: RELATED_IMAGE_AGENT_IMAGE_13_42_0_9892_1
+              value: "quay.io/mongodb/mongodb-agent:13.42.0.9892-1"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_26
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:6.0.26"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_6_0_27
@@ -182,6 +186,8 @@ spec:
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.17"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_18
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.18"
+            - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_7_0_19
+              value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:7.0.19"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_0
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.0"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_1
@@ -208,6 +214,8 @@ spec:
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.14"
             - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_15
               value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.15"
+            - name: RELATED_IMAGE_OPS_MANAGER_IMAGE_REPOSITORY_8_0_16
+              value: "quay.io/mongodb/mongodb-enterprise-ops-manager-ubi:8.0.16"
             # since the official server images end with a different suffix we can re-use the same $mongodbImageEnv
             - name: RELATED_IMAGE_MONGODB_IMAGE_4_4_0_ubi8
               value: "quay.io/mongodb/mongodb-enterprise-server:4.4.0-ubi8"