From ad7ded59e9584d1a8f4f8b7bf05bc871b9522aa9 Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Fri, 6 Jan 2017 10:21:07 +0100 Subject: [PATCH] Only use default resolver in dnsmasq when we are using host_resolvconf mode --- roles/dnsmasq/templates/01-kube-dns.conf.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/roles/dnsmasq/templates/01-kube-dns.conf.j2 b/roles/dnsmasq/templates/01-kube-dns.conf.j2 index 9f25d96e7..2ce30102f 100644 --- a/roles/dnsmasq/templates/01-kube-dns.conf.j2 +++ b/roles/dnsmasq/templates/01-kube-dns.conf.j2 @@ -15,15 +15,17 @@ local=/{{ bogus_domains }} {% for srv in upstream_dns_servers %} server={{ srv }} {% endfor %} -{% else %} +no-resolv +{% elif resolvconf_mode == 'host_resolvconf' %} +{# The default resolver is only needed when the hosts resolv.conf was modified by us. If it was not modified, we can rely on dnsmasq to reuse the systems resolv.conf #} server={{ default_resolver }} +no-resolv {% endif %} {% if kube_log_level == '4' %} log-queries {% endif %} bogus-priv -no-resolv no-negcache cache-size=1000 max-cache-ttl=10