mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-07-29 11:32:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7174 from reasonerjt/snapshot-flag-skip-csi

Browse Source 
Make sure the PVs skipped by CSI plugin due to settings in backup spec are tracked
This commit is contained in:
Xun Jiang/Bruce Jiang
2023-12-05 09:31:21 +08:00
committed by GitHub
parent 905de8cab1 266ea5d55a
commit 3b42abd139
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/backup/item_backupper.go
+2 -2
View File
@@ -384,8 +384,8 @@ func (ib *itemBackupper) executeActions(
// snapshot was skipped by CSI plugin
ib.trackSkippedPV(obj, groupResource, csiSnapshotApproach, "skipped b/c it's not a CSI volume", log)
delete(u.GetAnnotations(), skippedNoCSIPVAnnotation)
} else if actionName == csiBIAPluginName || actionName == vsphereBIAPluginName {
// the snapshot has been taken
} else if (actionName == csiBIAPluginName || actionName == vsphereBIAPluginName) && !boolptr.IsSetToFalse(ib.backupRequest.Backup.Spec.SnapshotVolumes) {
// the snapshot has been taken by the BIA plugin
ib.unTrackSkippedPV(obj, groupResource, log)
}
mustInclude := u.GetAnnotations()[mustIncludeAdditionalItemAnnotation] == "true" || finalize