vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move clearing up of metadata before plugin's actions 

Signed-off-by: Michal Wieczorek <wieczorek-michal@wp.pl>
pull/1032/head
Michal Wieczorek 2018-11-02 09:42:58 +01:00
parent 7c62ed2981
commit 7abe115674
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/restore/restore.go
View File

@ -740,6 +740,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
@ -765,12 +771,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()