CLOUDP-92134: Fix Flakey Version Changing (#566)

Author: chatton

controllers/replica_set_controller.go

@@ -56,6 +56,7 @@ const (
 	clusterDNSName = "CLUSTER_DNS_NAME"
 
 	lastSuccessfulConfiguration = "mongodb.com/v1.lastSuccessfulConfiguration"
+	lastAppliedMongoDBVersion   = "mongodb.com/v1.lastAppliedMongoDBVersion"
 )
 
 func init() {
@@ -232,11 +233,6 @@ func (r ReplicaSetReconciler) Reconcile(ctx context.Context, request reconcile.R
 		r.log.Errorf("Could not update connection string secrets: %s", err)
 	}
 
-	// the last version will be duplicated in two annotations.
-	// This is needed to reuse the update strategy logic in enterprise
-	if err := annotations.UpdateLastAppliedMongoDBVersion(&mdb, r.client); err != nil {
-		r.log.Errorf("Could not save current version as an annotation: %s", err)
-	}
 	if err := r.updateLastSuccessfulConfiguration(mdb); err != nil {
 		r.log.Errorf("Could not save current spec as an annotation: %s", err)
 	}
@@ -259,6 +255,9 @@ func (r *ReplicaSetReconciler) updateLastSuccessfulConfiguration(mdb mdbv1.Mongo
 
 	specAnnotations := map[string]string{
 		lastSuccessfulConfiguration: string(currentSpec),
+		// the last version will be duplicated in two annotations.
+		// This is needed to reuse the update strategy logic in enterprise
+		lastAppliedMongoDBVersion: mdb.Spec.Version,
 	}
 	return annotations.SetAnnotations(&mdb, specAnnotations, r.client)
 }

controllers/replicaset_controller_test.go

@@ -523,7 +523,22 @@ func TestIgnoreUnknownUsers(t *testing.T) {
 		mdb.Spec.Security.Authentication.IgnoreUnknownUsers = &ignoreUnknownUsers
 		assertAuthoritativeSet(t, mdb, true)
 	})
+}
+
+func TestAnnotationsAreAppliedToResource(t *testing.T) {
+	mdb := newTestReplicaSet()
+
+	mgr := client.NewManager(&mdb)
+	r := NewReconciler(mgr)
+	res, err := r.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Namespace: mdb.Namespace, Name: mdb.Name}})
+	assertReconciliationSuccessful(t, res, err)
+
+	err = mgr.GetClient().Get(context.TODO(), mdb.NamespacedName(), &mdb)
+	assert.NoError(t, err)
 
+	assert.NotNil(t, mdb.Annotations)
+	assert.NotEmpty(t, mdb.Annotations[lastSuccessfulConfiguration], "last successful spec should have been saved as annotation but was not")
+	assert.Equal(t, mdb.Annotations[lastAppliedMongoDBVersion], mdb.Spec.Version, "last version should have been saved as an annotation but was not")
 }
 
 // assertAuthoritativeSet asserts that a reconciliation of the given MongoDBCommunity resource

docs/RELEASE_NOTES.md

@@ -1,27 +1,13 @@
-# MongoDB Kubernetes Operator 0.6.1
+# MongoDB Kubernetes Operator 0.6.2
 
 ## Kubernetes Operator
-
-- Bug fixes
-  - when deleting MongoDB Resource cleanup related resources (k8s services, secrets).
 
 - Changes
-  - fixed an issue where the operator would reconcile based on events emitted by itself in certain situations.
-  - support connection strings using SRV.
-  - expose connection strings (including auth/tls values) for deployments as secrets for easy of use. Secrets name template: _\<MongoDB resource name\>-\<db\>-\<user\>_
-
-## MongoDB Agent ReadinessProbe
-
-- Changes
-  - Readiness probe now patches pod annotations rather than overwriting them.
-  
-## Miscellaneous
-Ubuntu-based agent images are now based on Ubuntu 20.04 instead of Ubuntu 16.06
+  - stability improvements when changing version of MongoDB.
 
 ## Updated Image Tags
 
-- mongodb-kubernetes-operator:0.6.1
-- mongodb-kubernetes-readinessprobe:1.0.4
+- mongodb-kubernetes-operator:0.6.2
 
 _All the images can be found in:_