parent
b9525af464
commit
24860e4d50
|
@ -1387,7 +1387,13 @@ func (ctx *restoreContext) restoreItem(obj *unstructured.Unstructured, groupReso
|
|||
additionalResourceID := getResourceID(additionalItem.GroupResource, additionalItem.Namespace, additionalItem.Name)
|
||||
additionalObj, err := archive.Unmarshal(ctx.fileSystem, itemPath)
|
||||
if err != nil {
|
||||
errs.Add(namespace, errors.Wrapf(err, "error restoring additional item %s", additionalResourceID))
|
||||
ctx.log.WithError(err).WithFields(logrus.Fields{
|
||||
"additionalResource": additionalItem.GroupResource.String(),
|
||||
"additionalResourceNamespace": additionalItem.Namespace,
|
||||
"additionalResourceName": additionalItem.Name,
|
||||
}).Warn("Could not unmarshal additional item")
|
||||
errs.Add(namespace, errors.Wrapf(err, "Could not unmarshal additional item: %s", additionalResourceID))
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
|
|
|
@ -1021,7 +1021,7 @@ func TestInvalidTarballContents(t *testing.T) {
|
|||
},
|
||||
wantErrs: Result{
|
||||
Namespaces: map[string][]string{
|
||||
"ns-1": {"error restoring additional item persistentvolumes/pv-1"},
|
||||
"ns-1": {"Could not unmarshal additional item: persistentvolumes/pv-1"},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue