Merge pull request #27736 from mml/fed-check-err-first

Automatic merge from submit-queue

Check for an error before checking for nil.
This commit is contained in:
k8s-merge-robot 2016-06-20 22:21:14 -07:00 committed by GitHub
commit 64b2c0e2db

View File

@ -283,12 +283,12 @@ func (s *ServiceController) ensureDnsRecords(clusterName string, cachedService *
serviceName := cachedService.lastState.Name
namespaceName := cachedService.lastState.Namespace
zoneNames, regionName, err := s.getClusterZoneNames(clusterName)
if zoneNames == nil {
return fmt.Errorf("fail to get cluster zone names")
}
if err != nil {
return err
}
if zoneNames == nil {
return fmt.Errorf("failed to get cluster zone names")
}
dnsZoneName, err := s.getFederationDNSZoneName()
if err != nil {
return err