fix: recurrent backup remote delete policy can not update

Author: drivebyer

CHANGELOG.md

@@ -15,6 +15,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Fixed
  * `orchestrator.secretName` is ignored in helm charts
  * Operator service account have no access to update mysqlbackups/status
+ * Recurrent backup remote delete policy can not update according to the `cluster.Spec.BackupRemoteDeletePolicy`
 
 ## [0.6.1] - 2021-12-22
 ### Changed

pkg/controller/mysqlbackupcron/mysqlbackupcron_controller.go

@@ -166,11 +166,8 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
 
 			// change scheduler for already added crons
 			if !reflect.DeepEqual(entry.Schedule, schedule) {
-				log.Info("update cluster scheduler", "key", cluster,
-					"scheduler", cluster.Spec.BackupSchedule)
-
+				log.Info("update cluster scheduler", "key", cluster, "scheduler", cluster.Spec.BackupSchedule)
 				r.cron.Remove(entry.ID)
-
 				break
 			}
 
@@ -182,9 +179,14 @@ func (r *ReconcileMysqlBackup) updateClusterSchedule(cluster *mysqlv1alpha1.Mysq
 				}
 				log.Info("update cluster backup limit", "key", cluster, "limit_val", newValFmt)
 				r.cron.Remove(entry.ID)
-
 				break
+			}
 
+			// update backup remote delete policy for already added crons
+			if !reflect.DeepEqual(cluster.Spec.BackupRemoteDeletePolicy, j.BackupRemoteDeletePolicy) {
+				log.Info("update cluster backup remote delete policy", "key", cluster, "policy", cluster.Spec.BackupRemoteDeletePolicy)
+				r.cron.Remove(entry.ID)
+				break
 			}
 
 			// nothing to change for this cluster, return

pkg/controller/mysqlbackupcron/mysqlbackupcron_controller_test.go

@@ -200,6 +200,30 @@ var _ = Describe("MysqlBackupCron controller", func() {
 			})))
 		})
 
+		It("should update backup remote delete policy", func() {
+			cluster.Spec.BackupRemoteDeletePolicy = api.Delete
+			Expect(c.Update(context.TODO(), cluster)).To(Succeed())
+			Eventually(requests, timeout).Should(Receive(Equal(expectedRequest)))
+			Expect(cron.Entries()).To(ContainElement(MatchFields(IgnoreExtras, Fields{
+				"Job": PointTo(MatchFields(IgnoreExtras, Fields{
+					"ClusterName":              Equal(cluster.Name),
+					"BackupRemoteDeletePolicy": Equal(api.Delete),
+				})),
+			})))
+
+			cluster.Spec.BackupRemoteDeletePolicy = api.Retain
+			Expect(c.Update(context.TODO(), cluster)).To(Succeed())
+			Eventually(requests, timeout).Should(Receive(Equal(expectedRequest)))
+			Expect(cron.Entries()).To(ContainElement(MatchFields(IgnoreExtras, Fields{
+				"Job": PointTo(MatchFields(IgnoreExtras, Fields{
+					"ClusterName":              Equal(cluster.Name),
+					"BackupRemoteDeletePolicy": Equal(api.Retain),
+				})),
+			})))
+
+			Expect(cron.Entries()).To(HaveLen(1))
+		})
+
 		When("backup is executed once per second", func() {
 			var (
 				timeout = 5 * time.Second