mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-08-15 11:46:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1032 from mwieczorek/plugins

Browse Source 
Move clearing up of metadata before plugin's actions
This commit is contained in:
Steve Kriss
2018-11-08 12:00:33 -07:00
committed by GitHub
parent 5d039e4b23 7abe115674
commit 449cac5806
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/restore/restore.go
+6 -6
View File
@@ -750,6 +750,12 @@ func (ctx *context) restoreResource(resource, namespace, resourcePath string) (a
}
}
// clear out non-core metadata fields & status
if obj, err = resetMetadataAndStatus(obj); err != nil {
addToResult(&errs, namespace, err)
continue
}
for _, action := range applicableActions {
if !action.selector.Matches(labels.Set(obj.GetLabels())) {
continue
@@ -775,12 +781,6 @@ func (ctx *context) restoreResource(resource, namespace, resourcePath string) (a
obj = unstructuredObj
}
// clear out non-core metadata fields & status
if obj, err = resetMetadataAndStatus(obj); err != nil {
addToResult(&errs, namespace, err)
continue
}
// necessary because we may have remapped the namespace
// if the namespace is blank, don't create the key
originalNamespace := obj.GetNamespace()