Merge branch 'master' into asset-image-info-json

Author: viveksinghggits

.evergreen-tasks.yml

@@ -690,6 +690,46 @@ tasks:
     commands:
       - func: "e2e_test"
 
+  - name: e2e_sharded_cluster_scram_sha_256_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_sharded_cluster_scram_sha_1_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_sharded_cluster_x509_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_replica_set_scram_sha_256_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_replica_set_scram_sha_1_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_replica_set_x509_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_replica_set_ldap_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
+  - name: e2e_sharded_cluster_ldap_switch_project
+    tags: [ "patch-run" ]
+    commands:
+      - func: "e2e_test"
+
   # TODO: not used in any variant
   - name: e2e_replica_set_scram_x509_internal_cluster
     tags: [ "patch-run" ]

.evergreen.yml

@@ -745,6 +745,15 @@ task_groups:
       - e2e_sharded_cluster_scram_sha_1_user_connectivity
       - e2e_sharded_cluster_scram_x509_ic_manual_certs
       - e2e_sharded_cluster_external_access
+      - e2e_replica_set_scram_sha_256_switch_project
+      - e2e_sharded_cluster_scram_sha_256_switch_project
+      - e2e_replica_set_scram_sha_1_switch_project
+      - e2e_sharded_cluster_scram_sha_1_switch_project
+      # TODO CLOUDP-349093 - Disabled these tests as they don't use the password secret, and project migrations aren't fully supported yet.  
+      # e2e_sharded_cluster_x509_switch_project
+      # e2e_replica_set_x509_switch_project
+      # e2e_replica_set_ldap_switch_project
+      # e2e_sharded_cluster_ldap_switch_project
       # e2e_auth_transitions_task_group
       - e2e_replica_set_scram_sha_and_x509
       - e2e_replica_set_x509_to_scram_transition

.github/pull_request_template.md

@@ -1,6 +1,6 @@
 # Summary
 
-<!-- Enter your issue summary here.-->
+<!-- Enter your PR summary here. Try to emphasize on WHY this change is needed, followed by what's being done in the PR. -->
 
 ## Proof of Work
 

api/v1/mdb/mongodb_types.go

@@ -171,6 +171,13 @@ func (m *MongoDB) GetOwnerLabels() map[string]string {
 	}
 }
 
+// GetKind returns the Kind of the MongoDB resource. This is needed because
+// when objects are retrieved from the Kubernetes API, the TypeMeta
+// (which contains Kind and APIVersion) is not populated.
+func (m *MongoDB) GetKind() string {
+	return "MongoDB"
+}
+
 // GetSecretsMountedIntoDBPod returns a list of all the optional secret names that are used by this resource.
 func (m *MongoDB) GetSecretsMountedIntoDBPod() []string {
 	secrets := []string{}
@@ -688,10 +695,10 @@ func (m *MongoDbSpec) GetClusterDomain() string {
 
 func (m *MongoDbSpec) MinimumMajorVersion() uint64 {
 	if m.FeatureCompatibilityVersion != nil && *m.FeatureCompatibilityVersion != "" {
-		fcv := *m.FeatureCompatibilityVersion
+		fcvString := *m.FeatureCompatibilityVersion
 
 		// ignore errors here as the format of FCV/version is handled by CRD validation
-		semverFcv, _ := semver.Make(fmt.Sprintf("%s.0", fcv))
+		semverFcv, _ := fcv.FeatureCompatibilityVersionToSemverFormat(fcvString)
 		return semverFcv.Major
 	}
 	semverVersion, _ := semver.Make(m.GetMongoDBVersion())

api/v1/mdb/mongodb_validation.go

@@ -12,6 +12,7 @@ import (
 
 	v1 "github.com/mongodb/mongodb-kubernetes/api/v1"
 	"github.com/mongodb/mongodb-kubernetes/api/v1/status"
+	"github.com/mongodb/mongodb-kubernetes/pkg/fcv"
 	"github.com/mongodb/mongodb-kubernetes/pkg/multicluster"
 	"github.com/mongodb/mongodb-kubernetes/pkg/util"
 	"github.com/mongodb/mongodb-kubernetes/pkg/util/stringutil"
@@ -430,15 +431,21 @@ func featureCompatibilityVersionValidation(d DbCommonSpec) v1.ValidationResult {
 	return ValidateFCV(fcv)
 }
 
-func ValidateFCV(fcv *string) v1.ValidationResult {
-	if fcv != nil {
-		f := *fcv
-		if f == util.AlwaysMatchVersionFCV {
+func ValidateFCV(fcvStringPointer *string) v1.ValidationResult {
+	if fcvStringPointer != nil {
+		fcvString := *fcvStringPointer
+		if fcvString == util.AlwaysMatchVersionFCV {
 			return v1.ValidationSuccess()
 		}
-		splitted := strings.Split(f, ".")
+
+		splitted := strings.Split(fcvString, ".")
 		if len(splitted) != 2 {
-			return v1.ValidationError("invalid feature compatibility version: %s, possible values are: '%s' or 'major.minor'", f, util.AlwaysMatchVersionFCV)
+			return v1.ValidationError("invalid feature compatibility version %q, possible values are: '%s' or 'major.minor'", fcvString, util.AlwaysMatchVersionFCV)
+		}
+
+		_, err := fcv.FeatureCompatibilityVersionToSemverFormat(fcvString)
+		if err != nil {
+			return v1.ValidationError("invalid feature compatibility version %q: %s", fcvString, err)
 		}
 	}
 	return v1.ValidationResult{}

api/v1/mdb/mongodb_validation_test.go

@@ -244,7 +244,7 @@ func TestReplicasetFCV(t *testing.T) {
 			name:                 "Invalid FCV value",
 			fcv:                  ptr.To("test"),
 			expectError:          true,
-			expectedErrorMessage: "invalid feature compatibility version: test, possible values are: 'AlwaysMatchVersion' or 'major.minor'",
+			expectedErrorMessage: "invalid feature compatibility version \"test\", possible values are: 'AlwaysMatchVersion' or 'major.minor'",
 		},
 		{
 			name:        "Valid FCV with specific version",
@@ -255,7 +255,13 @@ func TestReplicasetFCV(t *testing.T) {
 			name:                 "Invalid FCV - not major.minor only",
 			fcv:                  ptr.To("4.0.0"),
 			expectError:          true,
-			expectedErrorMessage: "invalid feature compatibility version: 4.0.0, possible values are: 'AlwaysMatchVersion' or 'major.minor'",
+			expectedErrorMessage: "invalid feature compatibility version \"4.0.0\", possible values are: 'AlwaysMatchVersion' or 'major.minor'",
+		},
+		{
+			name:                 "Invalid FCV - not major leading 0",
+			fcv:                  ptr.To("4.01"),
+			expectError:          true,
+			expectedErrorMessage: "invalid feature compatibility version \"4.01\": Minor number must not contain leading zeroes \"01\"",
 		},
 		{
 			name:        "Valid FCV with AlwaysMatchVersion",

api/v1/mdbmulti/mongodb_multi_types.go

@@ -180,6 +180,13 @@ func (m *MongoDBMultiCluster) GetOwnerLabels() map[string]string {
 	}
 }
 
+// GetKind returns the Kind of the MongoDBMultiCluster resource. This is needed because
+// when objects are retrieved from the Kubernetes API, the TypeMeta
+// (which contains Kind and APIVersion) is not populated.
+func (m *MongoDBMultiCluster) GetKind() string {
+	return "MongoDBMultiCluster"
+}
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 type MongoDBMultiClusterList struct {
 	metav1.TypeMeta `json:",inline"`
@@ -535,10 +542,10 @@ func (m *MongoDBMultiSpec) GetMemberOptions() []automationconfig.MemberOptions {
 
 func (m *MongoDBMultiSpec) MinimumMajorVersion() uint64 {
 	if m.FeatureCompatibilityVersion != nil && *m.FeatureCompatibilityVersion != "" {
-		fcv := *m.FeatureCompatibilityVersion
+		fcvString := *m.FeatureCompatibilityVersion
 
 		// ignore errors here as the format of FCV/version is handled by CRD validation
-		semverFcv, _ := semver.Make(fmt.Sprintf("%s.0", fcv))
+		semverFcv, _ := fcv.FeatureCompatibilityVersionToSemverFormat(fcvString)
 		return semverFcv.Major
 	}
 	semverVersion, _ := semver.Make(m.GetMongoDBVersion())

api/v1/om/opsmanager_types.go

@@ -349,6 +349,13 @@ func (om *MongoDBOpsManager) GetOwnerLabels() map[string]string {
 	}
 }
 
+// GetKind returns the Kind of the MongoDBOpsManager resource. This is needed because
+// when objects are retrieved from the Kubernetes API, the TypeMeta
+// (which contains Kind and APIVersion) is not populated.
+func (om *MongoDBOpsManager) GetKind() string {
+	return "MongoDBOpsManager"
+}
+
 // MongoDBOpsManagerServiceDefinition struct that defines the mechanism by which this Ops Manager resource
 // is exposed, via a Service, to the outside of the Kubernetes Cluster.
 type MongoDBOpsManagerServiceDefinition struct {

api/v1/owner.go

@@ -14,4 +14,8 @@ type ResourceOwner interface {
 type ObjectOwner interface {
 	ResourceOwner
 	client.Object
+	// GetKind returns the Kind of the resource. This is needed because
+	// when objects are retrieved from the Kubernetes API, the TypeMeta
+	// (which contains Kind and APIVersion) is not populated.
+	GetKind() string
 }

changelog/20251127_fix_backed_up_the_agent_password_in_a_secret_for_scram.md

@@ -0,0 +1,6 @@
+---
+kind: fix
+date: 2025-11-27
+---
+
+* Backed up the agent password in a secret for SCRAM authentication to prevent unnecessary password rotations.