External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-03 17:51:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

#3475 - make dnsmasq to send queries to all servers in upstream. Make… (#3481)

Browse Source 
* #3475 - make dnsmasq to send queries to all servers in upstream. Make dnsmasq config file customizable.

* Code style fixes. Return current behaviour for dnsmasq strict-order flag.
This commit is contained in:
pastushenko
2018-10-10 09:29:06 +03:00
committed by k8s-ci-robot
parent c27a91f7f0
commit b35a9fcb04
2 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
roles/dnsmasq/templates/01-kube-dns.conf.j2
View File

@@ -1,10 +1,24 @@
#Listen on localhost
{% if dnsmasq_enable_bind_interfaces %}
bind-interfaces
listen-address=0.0.0.0
{% endif %}
addn-hosts=/etc/hosts
{% if dnsmasq_listen_address|length > 0 %}
listen-address={{ dnsmasq_listen_address }}
{% endif %}
{% if dnsmasq_addn_hosts|length > 0 %}
addn-hosts={{ dnsmasq_addn_hosts }}
{% endif %}
{% if dnsmasq_enable_strict_order %}
strict-order
{% endif %}
{% if dnsmasq_enable_all_servers %}
all-servers
{% endif %}
# Forward k8s domain to kube-dns
server=/{{ dns_domain }}/{{ skydns_server }}
# Reply NXDOMAIN to bogus domains requests like com.cluster.local.cluster.local
@@ -28,11 +42,25 @@ server={{ cloud_resolver }}
{% if kube_log_level == '4' %}
log-queries
{% endif %}
{% if dnsmasq_enable_no_resolv %}
no-resolv
{% endif %}
{% if dnsmasq_enable_bogus_priv %}
bogus-priv
{% endif %}
{% if dnsmasq_enable_no_negcache %}
no-negcache
{% endif %}
cache-size={{ cache_size }}
dns-forward-max={{ dns_forward_max }}
max-cache-ttl=10
max-ttl=20
log-facility=-
max-cache-ttl={{ dnsmasq_max_cache_ttl }}
max-ttl={{ dnsmasq_max_ttl }}
log-facility={{ dnsmasq_log_facility }}
{% for dnsmasq_additional_startup_parameter in dnsmasq_additional_startup_parameters %}
{{ dnsmasq_additional_startup_parameter }}
{% endfor %}