From e24c8845c483d6b7a4dee2d4d04b4a8421988949 Mon Sep 17 00:00:00 2001 From: half-life666 Date: Wed, 23 Mar 2022 15:29:52 +0800 Subject: [PATCH] Skip podvolumerestore creation when restore excludes pv/pvc Signed-off-by: half-life666 --- changelogs/unreleased/4769-half-life666 | 1 + pkg/restore/restore.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/4769-half-life666 diff --git a/changelogs/unreleased/4769-half-life666 b/changelogs/unreleased/4769-half-life666 new file mode 100644 index 000000000..374f5ce3c --- /dev/null +++ b/changelogs/unreleased/4769-half-life666 @@ -0,0 +1 @@ +Skip podvolumerestore creation when restore excludes pv/pvc diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 7eb8c8136..67681eea5 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -1296,7 +1296,10 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso return warnings, errs } - if len(restic.GetVolumeBackupsForPod(ctx.podVolumeBackups, pod, originalNamespace)) > 0 { + // Do not create podvolumerestore when current restore excludes pv/pvc + if ctx.resourceIncludesExcludes.ShouldInclude(kuberesource.PersistentVolumeClaims.String()) && + ctx.resourceIncludesExcludes.ShouldInclude(kuberesource.PersistentVolumes.String()) && + len(restic.GetVolumeBackupsForPod(ctx.podVolumeBackups, pod, originalNamespace)) > 0 { restorePodVolumeBackups(ctx, createdObj, originalNamespace) } }