volrep: Simplify annotation check

The check is trivial, ensuring that both pvc and pv have the expected
annotation value. The code was too complicated, using complex way to
access map value, adding 5 temporary variables, and complex conditions.

Simplify to the simplest possible form that anyone will understand
quickly.

Signed-off-by: Nir Soffer <nsoffer@redhat.com>

internal/controller/vrg_volrep.go

@@ -575,27 +575,18 @@ func (v *VRGInstance) generateArchiveAnnotation(gen int64) string {
 }
 
 func (v *VRGInstance) isArchivedAlready(pvc *corev1.PersistentVolumeClaim, log logr.Logger) bool {
-	pvHasAnnotation := false
-	pvcHasAnnotation := false
-
 	pv, err := v.getPVFromPVC(pvc)
 	if err != nil {
 		log.Error(err, "Failed to get PV to check if archived")
 
 		return false
 	}
 
-	pvcDesiredValue := v.generateArchiveAnnotation(pvc.Generation)
-	if v, ok := pvc.ObjectMeta.Annotations[pvcVRAnnotationArchivedKey]; ok && (v == pvcDesiredValue) {
-		pvcHasAnnotation = true
-	}
-
-	pvDesiredValue := v.generateArchiveAnnotation(pv.Generation)
-	if v, ok := pv.ObjectMeta.Annotations[pvcVRAnnotationArchivedKey]; ok && (v == pvDesiredValue) {
-		pvHasAnnotation = true
+	if pvc.Annotations[pvcVRAnnotationArchivedKey] != v.generateArchiveAnnotation(pvc.Generation) {
+		return false
 	}
 
-	if !pvHasAnnotation || !pvcHasAnnotation {
+	if pv.Annotations[pvcVRAnnotationArchivedKey] != v.generateArchiveAnnotation(pv.Generation) {
 		return false
 	}