From 7abe115674a12860614b22f70a42a16708b8ccc3 Mon Sep 17 00:00:00 2001 From: Michal Wieczorek Date: Fri, 2 Nov 2018 09:42:58 +0100 Subject: [PATCH] Move clearing up of metadata before plugin's actions Signed-off-by: Michal Wieczorek --- pkg/restore/restore.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go index 2a5f79bdf..94a1f252a 100644 --- a/pkg/restore/restore.go +++ b/pkg/restore/restore.go @@ -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()