fix

e2e/suite_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 	"time"
 
+	backupv1 "github.com/cybozu-go/rbd-backup-system/api/v1"
 	"github.com/cybozu-go/rbd-backup-system/internal/controller"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -284,6 +285,32 @@ var _ = Describe("rbd backup system", func() {
 		}).Should(Succeed())
 	})
 
+	It("should not delete RBDPVCBackup resource when delete backup target PVC", func() {
+		By("Deleting backup target PVC")
+		_, _, err := kubectl("-n", namespace, "delete", "pvc", pvcName2)
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Checking backup target PVC deletion")
+		Eventually(func() error {
+			stdout, stderr, err := kubectl("-n", namespace, "get", "pvc", pvcName2)
+			if err != nil {
+				if strings.Contains(string(stderr), kubectlIsNotFoundMessage) {
+					return nil
+				}
+				return fmt.Errorf("get pvc %s failed. stderr: %s, err: %w", pvcName2, string(stderr), err)
+			}
+			return fmt.Errorf("PVC %s still exists. stdout: %s", pvcName2, stdout)
+		}).Should(Succeed())
+
+		By("Checking that the status.conditions of the RBDPVCBackup resource remain \"Bound\"")
+		stdout, _, err := kubectl("-n", namespace, "get", "rbdpvcbackup", rbdPVCBackupName3, "-o", "json")
+		Expect(err).NotTo(HaveOccurred())
+		var backup backupv1.RBDPVCBackup
+		err = yaml.Unmarshal(stdout, &backup)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(backup.Status.Conditions).To(Equal(backupv1.RBDPVCBackupConditionsBound))
+	})
+
 	It("should delete RBDPVCBackup resource", func() {
 		By("Delete RBDPVCBackup")
 		_, _, err := kubectl("-n", namespace, "delete", "rbdpvcbackup", rbdPVCBackupName, "--wait=false")
@@ -330,22 +357,6 @@ var _ = Describe("rbd backup system", func() {
 	})
 
 	It("should delete RBDPVCBackup resource when backup target PVC is missing", func() {
-		By("Deleting backup target PVC")
-		_, _, err := kubectl("-n", namespace, "delete", "pvc", pvcName2)
-		Expect(err).NotTo(HaveOccurred())
-
-		By("Checking backup target PVC deletion")
-		Eventually(func() error {
-			stdout, stderr, err := kubectl("-n", namespace, "get", "pvc", pvcName2)
-			if err != nil {
-				if strings.Contains(string(stderr), kubectlIsNotFoundMessage) {
-					return nil
-				}
-				return fmt.Errorf("get pvc %s failed. stderr: %s, err: %w", pvcName2, string(stderr), err)
-			}
-			return fmt.Errorf("PVC %s still exists. stdout: %s", pvcName2, stdout)
-		}).Should(Succeed())
-
 		By("Deleting RBDPVCBackup resource")
 		_, _, err = kubectl("-n", namespace, "delete", "rbdpvcbackup", rbdPVCBackupName3)
 		Expect(err).NotTo(HaveOccurred())