Merge branch 'master' into master

This commit is contained in:
zoues
2017-05-23 09:32:28 +08:00
committed by GitHub
68 changed files with 507 additions and 332 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