Fix delete BackupPolicy error

api/v1beta1/backuppolicy_webhook.go

@@ -53,7 +53,10 @@ func (r *BackupPolicy) ValidateDelete() error {
 		if cluster.Spec.BackupPolicyName == nil {
 			continue
 		}
-		return fmt.Errorf("MySQLCluster %s/%s has a reference to this policy", cluster.Namespace, cluster.Name)
+
+		if *cluster.Spec.BackupPolicyName == r.Name {
+			return fmt.Errorf("MySQLCluster %s/%s has a reference to this policy", cluster.Namespace, cluster.Name)
+		}
 	}
 	return nil
 }

api/v1beta1/backuppolicy_webhook_test.go

@@ -25,8 +25,11 @@ var _ = Describe("BackupPolicy Webhook", func() {
 	ctx := context.TODO()
 
 	BeforeEach(func() {
+		err := deleteMySQLCluster()
+		Expect(err).NotTo(HaveOccurred())
+
 		r := &BackupPolicy{}
-		err := k8sClient.Get(ctx, client.ObjectKey{Namespace: "default", Name: "test"}, r)
+		err = k8sClient.Get(ctx, client.ObjectKey{Namespace: "default", Name: "test"}, r)
 		if apierrors.IsNotFound(err) {
 			return
 		}
@@ -74,4 +77,33 @@ var _ = Describe("BackupPolicy Webhook", func() {
 		err := k8sClient.Create(ctx, r)
 		Expect(err).To(HaveOccurred())
 	})
+
+	It("should delete BackupPolicy", func() {
+		cluster := makeMySQLCluster()
+		cluster.Spec.BackupPolicyName = pointer.String("no-test")
+		err := k8sClient.Create(ctx, cluster)
+		Expect(err).NotTo(HaveOccurred())
+
+		backup := makeBackupPolicy()
+		err = k8sClient.Create(ctx, backup)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = k8sClient.Delete(ctx, backup)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should NOT delete BackupPolicy which is referenced by MySQLCluster", func() {
+		cluster := makeMySQLCluster()
+		cluster.Spec.BackupPolicyName = pointer.String("test")
+		err := k8sClient.Create(ctx, cluster)
+		Expect(err).NotTo(HaveOccurred())
+
+		backup := makeBackupPolicy()
+		err = k8sClient.Create(ctx, backup)
+		Expect(err).NotTo(HaveOccurred())
+
+		err = k8sClient.Delete(ctx, backup)
+		Expect(err).To(HaveOccurred())
+	})
+
 })

api/v1beta1/mysqlcluster_webhook_test.go

@@ -41,20 +41,34 @@ func makeMySQLCluster() *MySQLCluster {
 	}
 }
 
+func deleteMySQLCluster() error {
+	r := &MySQLCluster{}
+	err := k8sClient.Get(ctx, client.ObjectKey{Namespace: "default", Name: "test"}, r)
+	if apierrors.IsNotFound(err) {
+		return nil
+	}
+
+	if err != nil {
+		return err
+	}
+
+	r.Finalizers = nil
+	if err := k8sClient.Update(ctx, r); err != nil {
+		return err
+	}
+
+	if err := k8sClient.Delete(ctx, r); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 var _ = Describe("MySQLCluster Webhook", func() {
 	ctx := context.TODO()
 
 	BeforeEach(func() {
-		r := &MySQLCluster{}
-		err := k8sClient.Get(ctx, client.ObjectKey{Namespace: "default", Name: "test"}, r)
-		if apierrors.IsNotFound(err) {
-			return
-		}
-		Expect(err).NotTo(HaveOccurred())
-		r.Finalizers = nil
-		err = k8sClient.Update(ctx, r)
-		Expect(err).NotTo(HaveOccurred())
-		err = k8sClient.Delete(ctx, r)
+		err := deleteMySQLCluster()
 		Expect(err).NotTo(HaveOccurred())
 	})
 

controllers/mysqlcluster_controller_test.go

@@ -1150,7 +1150,7 @@ var _ = Describe("MySQLCluster reconciler", func() {
 			"single",
 			"test",
 			"test",
-			now.Format(constants.BackupTimeFormat),
+			now.UTC().Format(constants.BackupTimeFormat),
 		}))
 		Expect(c.EnvFrom).To(HaveLen(1))
 		Expect(c.Env).To(HaveLen(2))