mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-10-01 04:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7586 from Lyndon-Li/release-1.13

Browse Source 
[1.13] Issue 7535: add the MustHave resource check during item collection and item filter for restore
This commit is contained in:
qiuming
2024-03-29 12:20:45 +08:00
committed by GitHub
parent 4142722b29 6bcd5bee7c
commit 9f9464c5fd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changelogs/unreleased/7586-Lyndon-Li
+1
View File
@@ -0,0 +1 @@
Fix issue #7535, add the MustHave resource check during item collection and item filter for restore
pkg/restore/restore.go
+2 -2
View File
@@ -1123,7 +1123,7 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
// Check if group/resource should be restored. We need to do this here since
// this method may be getting called for an additional item which is a group/resource
// that's excluded.
if !ctx.resourceIncludesExcludes.ShouldInclude(groupResource.String()) {
if !ctx.resourceIncludesExcludes.ShouldInclude(groupResource.String()) && !ctx.resourceMustHave.Has(groupResource.String()) {
restoreLogger.Info("Not restoring item because resource is excluded")
return warnings, errs, itemExists
}
@@ -2198,7 +2198,7 @@ func (ctx *restoreContext) getOrderedResourceCollection(
// Check if the resource should be restored according to the resource
// includes/excludes.
if !ctx.resourceIncludesExcludes.ShouldInclude(groupResource.String()) {
if !ctx.resourceIncludesExcludes.ShouldInclude(groupResource.String()) && !ctx.resourceMustHave.Has(groupResource.String()) {
ctx.log.WithField("resource", groupResource.String()).Infof("Skipping restore of resource because the restore spec excludes it")
continue
}