Default values for variable dns_servers and dns_domain are set in two files: (#3999)

values from inventory in roles/kubespray-defaults/defaults/main.yml
hardcoded values in roles/container-engine/defaults/main.yml

dns_servers set empty in roles/container-engine/defaults/main.yml and skydns_server not set in docker_dns_servers variables
also set default value for manual_dns_serve

another variables in roles/container-engine/defaults not need to set
This commit is contained in:
Sergey 2019-03-28 16:22:44 +03:00 committed by Kubernetes Prow Robot
parent 669ab10c17
commit e9c34fe038
2 changed files with 1 additions and 7 deletions

View file

@ -1,6 +0,0 @@
---
## DNS
dns_domain: cluster.local
dns_servers: []
upstream_dns_servers: []
searchdomains: []

View file

@ -63,7 +63,7 @@ enable_nodelocaldns: False
nodelocaldns_ip: 169.254.25.10 nodelocaldns_ip: 169.254.25.10
# Should be set to a cluster IP if using a custom cluster DNS # Should be set to a cluster IP if using a custom cluster DNS
# manual_dns_server: 10.x.x.x manual_dns_server: ""
# Can be docker_dns, host_resolvconf or none # Can be docker_dns, host_resolvconf or none
resolvconf_mode: docker_dns resolvconf_mode: docker_dns