issue 7535: don't exclude resources in MustHave list during restore

Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
vmware-tanzu · Mar 29, 2024 · 070e99d · 070e99d
1 parent 65e8ddb
commit 070e99d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelogs/unreleased/7585-Lyndon-Li b/changelogs/unreleased/7585-Lyndon-Li
@@ -0,0 +1 @@
+Fix issue #7535, add the MustHave resource check during item collection and item filter for restore
diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go
@@ -2202,7 +2202,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
 		}