github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 23:15:14 +00:00
Code Issues Projects Releases Wiki Activity

To get the zone information, select a node which actually has that annotation.

Browse Source 
Also, use the cluster zone information while generating the CNAME
response for federation queries.
This commit is contained in:
Madhusudan.C.S 2016-05-18 00:05:28 -07:00
parent 3ee2b76554
commit 13fef23102
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/dns/dns.go
View File

@ -533,6 +533,11 @@ func (kd *KubeDNS) federationRecords(queryPath []string) ([]skymsg.Service, erro
path = path[:len(path)-len(kd.domainPath)]
// Append the zone name (zone in the cloud provider terminology, not a DNS zone)
zone, err := kd.getClusterZone()
if err != nil {
return nil, fmt.Errorf("failed to obtain the cluster zone: %v", err)
}
path = append(path, zone)
// We have already established that the map entry exists for the given federation,
// we just need to retrieve the domain name, validate it and append it to the path.
@ -578,9 +583,16 @@ func (kd *KubeDNS) getClusterZone() (string, error) {
return "", fmt.Errorf("failed to retrieve the cluster nodes: %v", err)
}
node = &nodeList.Items[0]
if err := kd.nodesStore.Add(node); err != nil {
return "", fmt.Errorf("couldn't add the retrieved node to the cache: %v", err)
// Select a node (arbitrarily the first node) that has `LabelZoneFailureDomain` set.
for _, nodeItem := range nodeList.Items {
if _, ok := nodeItem.Annotations[unversioned.LabelZoneFailureDomain]; !ok {
continue
}
// Make a copy of the node, don't rely on the loop variable.
node = &(*(&nodeItem))
if err := kd.nodesStore.Add(node); err != nil {
return "", fmt.Errorf("couldn't add the retrieved node to the cache: %v", err)
}
}
}