Rename annotation and other misc changes

Signed-off-by: Benamar Mekhissi <[email protected]>
RamenDR · Nov 12, 2024 · 1f11958 · 1f11958
1 parent 7a22e27
commit 1f11958
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/internal/controller/drplacementcontrol_controller.go b/internal/controller/drplacementcontrol_controller.go
@@ -2309,7 +2309,7 @@ func constructVRGFromView(viewVRG *rmn.VolumeReplicationGroup) *rmn.VolumeReplic
 			fallthrough
 		case rmnutil.IsCGEnabledAnnotation:
 			fallthrough
-		case rmnutil.UseVolSyncForPVCProtection:
+		case rmnutil.UseVolSyncAnnotation:
 			fallthrough
 		case DRPCUIDAnnotation:
 			rmnutil.AddAnnotation(vrg, k, v)

diff --git a/internal/controller/util/misc.go b/internal/controller/util/misc.go
@@ -23,8 +23,8 @@ const (
 
 	IsCGEnabledAnnotation = "drplacementcontrol.ramendr.openshift.io/is-cg-enabled"
 
-	// Annotation
-	UseVolSyncForPVCProtection = "drplacementcontrol.ramendr.openshift.io/use-volsync-for-pvc-protection"
+	// When this annotation is set to true, VolSync will protect RBD PVCs.
+	UseVolSyncAnnotation = "drplacementcontrol.ramendr.openshift.io/use-volsync-for-pvc-protection"
 )
 
 type ResourceUpdater struct {
@@ -243,7 +243,7 @@ func IsCGEnabled(annotations map[string]string) bool {
 }
 
 func IsPVCMarkedForVolSync(annotations map[string]string) bool {
-	return annotations[UseVolSyncForPVCProtection] == "true"
+	return annotations[UseVolSyncAnnotation] == "true"
 }
 
 func TrimToK8sResourceNameLength(name string) string {

diff --git a/internal/controller/util/misc_test.go b/internal/controller/util/misc_test.go
@@ -16,6 +16,6 @@ var _ = Describe("misc", func() {
 
 	Expect(util.IsPVCMarkedForVolSync(nil)).Should(Equal(false))
 	Expect(util.IsPVCMarkedForVolSync(map[string]string{})).Should(Equal(false))
-	Expect(util.IsPVCMarkedForVolSync(map[string]string{util.UseVolSyncForPVCProtection: "true"})).
+	Expect(util.IsPVCMarkedForVolSync(map[string]string{util.UseVolSyncAnnotation: "true"})).
 		Should(Equal(true))
 })
diff --git a/internal/controller/volsync/vshandler_test.go b/internal/controller/volsync/vshandler_test.go
@@ -692,14 +692,13 @@ var _ = Describe("VolSync_Handler", func() {
 						}, pvc)
 					}, maxWait, interval).Should(Succeed())
 
-					Expect(pvc.GetName()).To(Equal(rdSpec.ProtectedPVC.Name))
 					Expect(pvc.GetOwnerReferences()[0].Kind).To(Equal("ConfigMap"))
 					Expect(*pvc.Spec.VolumeMode).To(Equal(corev1.PersistentVolumeFilesystem))
 					Expect(k8sClient.Delete(ctx, pvc)).ToNot(HaveOccurred())
 				})
 
 				It("PrecreateDestPVCIfEnabled() should create PVC with volumeMode: Block", func() {
-					util.AddAnnotation(owner, util.UseVolSyncForPVCProtection, "true")
+					util.AddAnnotation(owner, util.UseVolSyncAnnotation, "true")
 					Expect(k8sClient.Update(ctx, owner)).To(Succeed())
 					rdSpecForBlockPVC := rdSpec.DeepCopy()
 					block := corev1.PersistentVolumeBlock

diff --git a/internal/controller/volumereplicationgroup_controller.go b/internal/controller/volumereplicationgroup_controller.go
@@ -833,12 +833,16 @@ func (v *VRGInstance) separatePVCsUsingOnlySC(storageClass *storagev1.StorageCla
 
 	replicationClassMatchFound := false
 
-	for _, replicationClass := range v.replClassList.Items {
-		if storageClass.Provisioner == replicationClass.Spec.Provisioner {
-			v.volRepPVCs = append(v.volRepPVCs, *pvc)
-			replicationClassMatchFound = true
+	pvcEnabledForVolSync := util.IsPVCMarkedForVolSync(v.instance.GetAnnotations())
 
-			break
+	if !pvcEnabledForVolSync {
+		for _, replicationClass := range v.replClassList.Items {
+			if storageClass.Provisioner == replicationClass.Spec.Provisioner {
+				v.volRepPVCs = append(v.volRepPVCs, *pvc)
+				replicationClassMatchFound = true
+
+				break
+			}
 		}
 	}