From 2fb5472e19b1f82681400f20f1ae2cc4143743e9 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 20 May 2015 09:04:15 -0700 Subject: [PATCH] Revert "Introduce an 'svc' segment for DNS search" --- pkg/kubelet/kubelet.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 0cbdb8e5207..cc2f2fc064a 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -864,12 +864,8 @@ func (kl *Kubelet) getClusterDNS(pod *api.Pod) ([]string, []string, error) { dns = append([]string{kl.clusterDNS.String()}, hostDNS...) } if kl.clusterDomain != "" { - // TODO(vishh): Remove the oldNsDomain entry once the DNS crossover to inject - // "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...) + nsDomain := fmt.Sprintf("%s.%s", pod.Namespace, kl.clusterDomain) + dnsSearch = append([]string{nsDomain, kl.clusterDomain}, hostSearch...) } return dns, dnsSearch, nil }