github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

Introduce an 'svc' segment for DNS search

Browse Source
This commit is contained in:
Tim Hockin 2015-05-11 17:12:59 -07:00
parent 43029345f9
commit 41033af256
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@ -864,8 +864,12 @@ func (kl *Kubelet) getClusterDNS(pod *api.Pod) ([]string, []string, error) {
dns = append([]string{kl.clusterDNS.String()}, hostDNS...) dns = append([]string{kl.clusterDNS.String()}, hostDNS...)
} }
if kl.clusterDomain != "" { if kl.clusterDomain != "" {
nsDomain := fmt.Sprintf("%s.%s", pod.Namespace, kl.clusterDomain) // TODO(vishh): Remove the oldNsDomain entry once the DNS crossover to inject
dnsSearch = append([]string{nsDomain, kl.clusterDomain}, hostSearch...) // "svc" is done.
oldNsDomain := fmt.Sprintf("%s.%s", pod.Namespace, kl.clusterDomain)
nsSvcDomain := fmt.Sprintf("%s.svc.%s", pod.Namespace, kl.clusterDomain)
svcDomain := fmt.Sprintf("svc.%s", kl.clusterDomain)
dnsSearch = append([]string{oldNsDomain, nsSvcDomain, svcDomain, kl.clusterDomain}, hostSearch...)
} }
return dns, dnsSearch, nil return dns, dnsSearch, nil
} }