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

Merge pull request #889 from ffd2subroutine/minor-code-cleanup 

Minor code cleanup
pull/894/head
Steve Kriss 2018-09-30 13:45:45 -06:00 committed by GitHub
parent a57acec43d 9fdf85130a
commit 3542f39f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/restore/service_action.go
View File

@ -57,8 +57,7 @@ func (a *serviceAction) Execute(obj runtime.Unstructured, restore *api.Restore)
delete(spec, "clusterIP") delete(spec, "clusterIP")
} }
err = deleteNodePorts(obj, &spec) if err := deleteNodePorts(obj, &spec); err != nil {
if err != nil {
return nil, nil, err return nil, nil, err
} }
return obj, nil, nil 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 { func deleteNodePorts(obj runtime.Unstructured, spec *map[string]interface{}) error {
if serviceType, _ := collections.GetString(*spec, "type"); serviceType == "ExternalName" {
return nil
}
preservedPorts, err := getPreservedPorts(obj) preservedPorts, err := getPreservedPorts(obj)
if err != nil { if err != nil {
return err return err
} }
ports, err := collections.GetSlice(obj.UnstructuredContent(), "spec.ports") ports, err := collections.GetSlice(obj.UnstructuredContent(), "spec.ports")
serviceType, _ := collections.GetString(*spec, "type") if err != nil {
if err != nil && serviceType != "ExternalName" {
return err return err
} }