github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27891 from mml/fed-nil-node

Browse Source 
Automatic merge from submit-queue

Catch the case where we cannot find any nodes.
This commit is contained in:
k8s-merge-robot 2016-06-22 13:43:12 -07:00 committed by GitHub
commit db43b68640
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/dns/dns.go
View File

@ -659,6 +659,10 @@ func (kd *KubeDNS) getClusterZone() (string, error) {
}
}
if node == nil {
return "", fmt.Errorf("Could not find any nodes")
}
zone, ok := node.Annotations[unversioned.LabelZoneFailureDomain]
if !ok || zone == "" {
return "", fmt.Errorf("unknown cluster zone")