Merge pull request #1289 from rsmitty/default-dns-mode

default to kubedns &set nxdomain in kubedns deployment if that's the dns_mode
This commit is contained in:
Spencer Smith 2017-05-15 09:52:07 -04:00 committed by GitHub
commit fecb41d2ef
2 changed files with 2 additions and 1 deletions

View file

@ -98,7 +98,7 @@ cluster_name: cluster.local
# Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods
ndots: 2
# Can be dnsmasq_kubedns, kubedns or none
dns_mode: dnsmasq_kubedns
dns_mode: kubedns
# Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns
# Deploy netchecker app to verify DNS resolve as an HTTP service

View file

@ -83,6 +83,7 @@ spec:
{% if kube_log_level == '4' %}
- --log-queries
{% endif %}
- --local=/{{ bogus_domains }}
ports:
- containerPort: 53
name: dns