Check for GVK before attempting restore.

Signed-off-by: Tiger Kaovilai <[email protected]> do not attempt restore resource with no available GVK in cluster Signed-off-by: Tiger Kaovilai <[email protected]>
vmware-tanzu · Jan 16, 2024 · a7de73e · a7de73e
1 parent 2caba3e
commit a7de73e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/changelogs/unreleased/7322-kaovilai b/changelogs/unreleased/7322-kaovilai
@@ -0,0 +1 @@
+Check resource Group Version and Kind is available in cluster before attempting restore to prevent being stuck.
diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go
@@ -1507,6 +1507,22 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
 		}
 	}
 
+	// Check if cluster has GVK required to restore resource, otherwise return err.
+	// Placed here because the object apiVersion might get modified by a RestorePlugin
+	// So we check for the GVK after the RestorePlugin has run.
+	_, _, err = ctx.discoveryHelper.KindFor(schema.GroupVersionKind{
+		Group:   groupResource.Group,
+		Version: obj.GetAPIVersion(),
+		Kind:    groupResource.Resource,
+	})
+	clusterHasKind := err == nil
+	if !clusterHasKind  {
+		ctx.log.Errorf("Cannot restore %s because GVK doesn't exist in the cluster", groupResource)
+		// Adding to errs should cause restore to partially fail
+		errs.Add(namespace, fmt.Errorf("cannot restore %s because gvk doesn't exist in the cluster", groupResource))
+		return warnings, errs, itemExists
+	}
+
 	// Necessary because we may have remapped the namespace if the namespace is
 	// blank, don't create the key.
 	originalNamespace := obj.GetNamespace()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Check resource Group Version and Kind is available in cluster before attempting restore to prevent being stuck.