Merge pull request #13043 from justinsb/automated-cherry-pick-of-#12029-upstream-release-1.0

Automated cherry pick of #12029
This commit is contained in:
Zach Loafman
2015-08-21 15:58:21 -07:00

View File

@@ -62,8 +62,13 @@ func (s *AWSCloud) ListRoutes(clusterName string) ([]*cloudprovider.Route, error
continue
}
instance, err := s.getInstanceById(instanceID)
if err != nil {
return nil, err
}
instanceName := orEmpty(instance.PrivateDNSName)
routeName := clusterName + "-" + destinationCIDR
routes = append(routes, &cloudprovider.Route{routeName, instanceID, destinationCIDR})
routes = append(routes, &cloudprovider.Route{routeName, instanceName, destinationCIDR})
}
return routes, nil