github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
federation/pkg/federation-controller/service/dns.go
View File

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