From 9fdf85130a7284f7252f20a49644539bb76efc28 Mon Sep 17 00:00:00 2001 From: ffd2subroutine Date: Sun, 30 Sep 2018 20:43:11 +0200 Subject: [PATCH] Minor code cleanup Signed-off-by: ffd2subroutine --- pkg/restore/service_action.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/restore/service_action.go b/pkg/restore/service_action.go index b71f3471c..98c1c9294 100644 --- a/pkg/restore/service_action.go +++ b/pkg/restore/service_action.go @@ -57,8 +57,7 @@ func (a *serviceAction) Execute(obj runtime.Unstructured, restore *api.Restore) delete(spec, "clusterIP") } - err = deleteNodePorts(obj, &spec) - if err != nil { + if err := deleteNodePorts(obj, &spec); err != nil { return nil, nil, err } return obj, nil, nil @@ -85,14 +84,17 @@ func getPreservedPorts(obj runtime.Unstructured) (map[string]bool, error) { } func deleteNodePorts(obj runtime.Unstructured, spec *map[string]interface{}) error { + if serviceType, _ := collections.GetString(*spec, "type"); serviceType == "ExternalName" { + return nil + } + preservedPorts, err := getPreservedPorts(obj) if err != nil { return err } ports, err := collections.GetSlice(obj.UnstructuredContent(), "spec.ports") - serviceType, _ := collections.GetString(*spec, "type") - if err != nil && serviceType != "ExternalName" { + if err != nil { return err }