feat: add e2e test for persistentVolumeClaimRetentionPolicy

Author: lenglet-k

config/samples/mongodb.com_v1_mongodbcommunity_persistent_volume_claim_retention_policy.yaml

@@ -2,7 +2,7 @@
 apiVersion: mongodbcommunity.mongodb.com/v1
 kind: MongoDBCommunity
 metadata:
-  name: mongodb-specify-readiness-probe-values
+  name: mongodb-specify-volumeclaimretention-values
 spec:
   members: 3
   type: ReplicaSet

…istentvolumeclaimretentionpolicy_test.go …istentvolumeclaimretentionpolicy_test.gotest/e2e/replica_set_custom_persistentvolumclaimretentionpolicy_test/replica_set_custom_persistentvolumeclaimretentionpolicy_test.go renamed to test/e2e/replica_set_custom_persistentvolumeclaimretentionpolicy_test/replica_set_custom_persistentvolumeclaimretentionpolicy_test.go test/e2e/replica_set_custom_persistentvolumclaimretentionpolicy_test/replica_set_custom_persistentvolumeclaimretentionpolicy_test.go renamed to test/e2e/replica_set_custom_persistentvolumeclaimretentionpolicy_test/replica_set_custom_persistentvolumeclaimretentionpolicy_test.go

@@ -27,10 +27,8 @@ func TestReplicaSetCustomPersistentVolumeClaimRetentionPolicy(t *testing.T) {
 	defer testCtx.Teardown()
 
 	mdb, user := e2eutil.NewTestMongoDB(testCtx, "mdb0", "")
-	var test appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy
-	test.WhenDeleted = "Deleted"
-	test.WhenScaled = "Deleted"
-	mdb.Spec.StatefulSetConfiguration.SpecWrapper.Spec.PersistentVolumeClaimRetentionPolicy = &test
+	overridePersistentVolumeClaim := appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy{WhenDeleted: "Delete", WhenScaled: "Delete"}
+	mdb.Spec.StatefulSetConfiguration.SpecWrapper.Spec.PersistentVolumeClaimRetentionPolicy = &overridePersistentVolumeClaim
 	scramUser := mdb.GetAuthUsers()[0]
 
 	_, err := setup.GeneratePasswordForUser(testCtx, user, "")
@@ -54,6 +52,5 @@ func TestReplicaSetCustomPersistentVolumeClaimRetentionPolicy(t *testing.T) {
 		tester.ConnectivitySucceeds(WithURI(mongodbtests.GetSrvConnectionStringForUser(ctx, mdb, scramUser))))
 	t.Run("Ensure Authentication", tester.EnsureAuthenticationIsConfigured(3))
 	t.Run("AutomationConfig has the correct version", mongodbtests.AutomationConfigVersionHasTheExpectedVersion(ctx, &mdb, 1))
-	t.Run("Statefulset has the expectd PersistentVolumeClaimRetentionPolicy", mongodbtests.StatefulSetHasPersistentVolumeClaimRetentionPolicy(ctx, &mdb, test))
-	t.Run("Cluster has the expected labels and annotations", mongodbtests.HasExpectedMetadata(ctx, &mdb, e2eutil.TestLabels(), e2eutil.TestAnnotations()))
+	t.Run("Statefulset has the expected PersistentVolumeClaimRetentionPolicy", mongodbtests.StatefulSetHasPersistentVolumeClaimRetentionPolicy(ctx, &mdb, overridePersistentVolumeClaim))
 }

test/e2e/util/wait/wait.go

@@ -102,7 +102,10 @@ func ForStatefulSetToHaveUpdateStrategy(ctx context.Context, t *testing.T, mdb *
 func ForStatefulSetToHavePersistentVolumeClaimRetentionPolicy(ctx context.Context, t *testing.T, mdb *mdbv1.MongoDBCommunity, persistentVolumeClaimRetentionPolicy appsv1.StatefulSetPersistentVolumeClaimRetentionPolicy, opts ...Configuration) error {
 	options := newOptions(opts...)
 	return waitForStatefulSetCondition(ctx, t, mdb, options, func(sts appsv1.StatefulSet) bool {
-		return sts.Spec.PersistentVolumeClaimRetentionPolicy.WhenScaled == persistentVolumeClaimRetentionPolicy.WhenScaled
+		if sts.Spec.PersistentVolumeClaimRetentionPolicy.WhenScaled == persistentVolumeClaimRetentionPolicy.WhenScaled && sts.Spec.PersistentVolumeClaimRetentionPolicy.WhenDeleted == persistentVolumeClaimRetentionPolicy.WhenDeleted {
+			return true
+		}
+		return false
 	})
 }