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

[1.13] Issue 7535: add the MustHave resource check during item collection and item filter for restore
vmware-tanzu · Mar 29, 2024 · 9f9464c · 9f9464c
2 parents 4142722 + 6bcd5be
commit 9f9464c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelogs/unreleased/7586-Lyndon-Li b/changelogs/unreleased/7586-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
@@ -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
 		}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix issue #7535, add the MustHave resource check during item collection and item filter for restore