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

Merge pull request #8568 from GoogleCloudPlatform/revert-8089-dns

Browse Source 
Revert "Introduce an 'svc' segment for DNS search"
This commit is contained in:
Tim Hockin 2015-05-20 09:42:44 -07:00
commit 2c54540896
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@ -997,12 +997,8 @@ 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 != "" {
// TODO(vishh): Remove the oldNsDomain entry once the DNS crossover to inject nsDomain := fmt.Sprintf("%s.%s", pod.Namespace, kl.clusterDomain)
// "svc" is done. dnsSearch = append([]string{nsDomain, kl.clusterDomain}, hostSearch...)
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
} }