default to kubedns and set nxdomain in kubedns deployment if that's the dns_mode

This commit is contained in:
Spencer Smith 2017-05-12 15:57:24 -04:00
parent 8eb60f5624
commit 31a7b7d24e
2 changed files with 4 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 # Subdomains of DNS domain to be resolved via /etc/resolv.conf for hostnet pods
ndots: 2 ndots: 2
# Can be dnsmasq_kubedns, kubedns or none # Can be dnsmasq_kubedns, kubedns or none
dns_mode: dnsmasq_kubedns dns_mode: kubedns
# Can be docker_dns, host_resolvconf or none # Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns resolvconf_mode: docker_dns
# Deploy netchecker app to verify DNS resolve as an HTTP service # Deploy netchecker app to verify DNS resolve as an HTTP service

View file

@ -82,6 +82,9 @@ spec:
- --server=127.0.0.1#10053 - --server=127.0.0.1#10053
{% if kube_log_level == '4' %} {% if kube_log_level == '4' %}
- --log-queries - --log-queries
{% endif %}
{% if dns_mode == 'kubedns' %}
- --local=/{{ bogus_domains }}
{% endif %} {% endif %}
ports: ports:
- containerPort: 53 - containerPort: 53