Merge pull request #6 from catalogicsoftware/KUBEDR-5960_David

KUBEDR-5960: Allow changing the backup method per PVC
catalogicsoftware · Sep 4, 2024 · abf68fa · abf68fa
2 parents 1d2bd1c + a9ed888
commit abf68fa
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ HUGO_IMAGE := hugo-builder
 local : ARCH ?= $(shell go env GOOS)-$(shell go env GOARCH)
 ARCH ?= linux-amd64
 
-VERSION ?= v1.14.0.1
+VERSION ?= v1.14.0.2
 
 TAG_LATEST ?= false
 

diff --git a/pkg/backup/actions/csi/pvc_action.go b/pkg/backup/actions/csi/pvc_action.go
@@ -19,6 +19,7 @@ package csi
 import (
 	"context"
 	"fmt"
+	"slices"
 	"strings"
 
 	snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
@@ -642,23 +643,36 @@ func (p *pvcBackupItemAction) shouldSkipSnapshot(pvc *corev1api.PersistentVolume
 		}
 	}
 
-	if backupMethod, found := config.StorageClassBackupMethodMap[*pvc.Spec.StorageClassName]; found {
-		if backupMethod == "SNAPSHOT" {
+	setBackupMethod, isBackupMethodSet := config.StorageClassBackupMethodMap[*pvc.Spec.StorageClassName]
+
+	annotations := pvc.GetAnnotations()
+	if backupMethod, found := annotations["cloudcasa.io/backup-method"]; found {
+		backupMethod = strings.ToUpper(strings.TrimSpace(backupMethod))
+		if slices.Contains([]string{"SNAPSHOT", "LIVE_FROM_PVC", "LIVE_FROM_HOST_POD_VOL", "LIVE", "SKIP"}, backupMethod) {
+			setBackupMethod = backupMethod
+			isBackupMethodSet = true
+		} else {
+			p.log.Infof("Ignoring invalid backup method %s for PVC %s/%s", backupMethod, pvc.Namespace, pvc.Name)
+		}
+	}
+
+	if isBackupMethodSet {
+		if setBackupMethod == "SNAPSHOT" {
 			return false, nil
 		}
 
-		if backupMethod == "SKIP" {
+		if setBackupMethod == "SKIP" {
 			p.log.Infof("Skipping snapshot of PVC %s/%s because backupMethod is set to SKIP", pvc.Namespace, pvc.Name)
 			return true, nil
 		}
 
-		if strings.HasPrefix(backupMethod, "LIVE") {
+		if strings.HasPrefix(setBackupMethod, "LIVE") {
 			if *pvc.Spec.VolumeMode != corev1api.PersistentVolumeBlock {
 				p.log.Infof("Skipping snapshot of PVC %s/%s with storage class %s and backup method %s", pvc.Namespace, pvc.Name,
-					*pvc.Spec.StorageClassName, backupMethod)
+					*pvc.Spec.StorageClassName, setBackupMethod)
 				return true, nil
 			} else {
-				p.log.Infof("Ignoring PVC %s/%s backup method %s because it is a block volume", pvc.Namespace, pvc.Name, backupMethod)
+				p.log.Infof("Ignoring PVC %s/%s backup method %s because it is a block volume", pvc.Namespace, pvc.Name, setBackupMethod)
 			}
 		}
 	}