Rename CopyMethod None to CopyMethod Direct

Signed-off-by: Tesshu Flower <tflower@redhat.com>
backube · Oct 28, 2021 · f4d62c5 · f4d62c5
1 parent dda3ba0
commit f4d62c5
Show file tree

Hide file tree

Showing 33 changed files with 334 additions and 237 deletions.
diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
@@ -35,11 +35,13 @@ package v1alpha1
 
 // CopyMethodType defines the methods for creating point-in-time copies of
 // volumes.
-//+kubebuilder:validation:Enum=None;Clone;Snapshot
+//+kubebuilder:validation:Enum=Direct;None;Clone;Snapshot
 type CopyMethodType string
 
 const (
-	// CopyMethodNone indicates a copy should not be performed.
+	// CopyMethodDirect indicates a copy should not be performed. Data will be copied directly to/from the PVC.
+	CopyMethodDirect CopyMethodType = "Direct"
+	// CopyMethodNone indicates a copy should not be performed. Deprecated (replaced by CopyMethodDirect).
 	CopyMethodNone CopyMethodType = "None"
 	// CopyMethodClone indicates a copy should be created using volume cloning.
 	CopyMethodClone CopyMethodType = "Clone"

diff --git a/config/crd/bases/volsync.backube_replicationdestinations.yaml b/config/crd/bases/volsync.backube_replicationdestinations.yaml
@@ -93,6 +93,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the destination volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot
@@ -164,6 +165,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the destination volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot
@@ -224,6 +226,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the destination volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot

diff --git a/config/crd/bases/volsync.backube_replicationsources.yaml b/config/crd/bases/volsync.backube_replicationsources.yaml
@@ -95,6 +95,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the source volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot
@@ -160,6 +161,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the source volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot
@@ -241,6 +243,7 @@ spec:
                     description: copyMethod describes how a point-in-time (PiT) image
                       of the source volume should be created.
                     enum:
+                    - Direct
                     - None
                     - Clone
                     - Snapshot

diff --git a/controllers/mover/restic/restic_test.go b/controllers/mover/restic/restic_test.go
@@ -443,6 +443,20 @@ var _ = Describe("Restic as a source", func() {
 					Expect(dataPVC.Labels).NotTo(HaveKey("volsync.backube/cleanup"))
 				})
 			})
+			When("CopyMethod is Direct", func() {
+				BeforeEach(func() {
+					rs.Spec.Restic.CopyMethod = volsyncv1alpha1.CopyMethodDirect
+				})
+				It("the source is used as the data PVC", func() {
+					dataPVC, err := mover.ensureSourcePVC(ctx)
+					Expect(err).ToNot(HaveOccurred())
+					Expect(dataPVC.Name).To(Equal(sPVC.Name))
+					// It's not owned by the CR
+					Expect(dataPVC.OwnerReferences).To(BeEmpty())
+					// It won't be cleaned up at the end of the transfer
+					Expect(dataPVC.Labels).NotTo(HaveKey("volsync.backube/cleanup"))
+				})
+			})
 			When("CopyMethod is Clone", func() {
 				BeforeEach(func() {
 					rs.Spec.Restic.CopyMethod = volsyncv1alpha1.CopyMethodClone