Merge pull request #1032 from mwieczorek/plugins
Move clearing up of metadata before plugin's actionspull/1006/head
commit
449cac5806
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue