Browse Source
[systemd-resolved] Fix DNS configuration according to docs/dns-stack.md and during reset of cluster (#8560) (#8561)
pull/8621/head
onock
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
1 deletions
-
reset.yml
-
roles/kubernetes/preinstall/templates/resolved.conf.j2
|
|
@ -32,4 +32,5 @@ |
|
|
|
environment: "{{ proxy_disable_env }}" |
|
|
|
roles: |
|
|
|
- { role: kubespray-defaults} |
|
|
|
- { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_early: true } |
|
|
|
- { role: reset, tags: reset } |
|
|
@ -1,6 +1,10 @@ |
|
|
|
[Resolve] |
|
|
|
{% if dns_early is sameas true and dns_late is sameas false %} |
|
|
|
#DNS= |
|
|
|
{% else %} |
|
|
|
DNS={{ ([nodelocaldns_ip] if enable_nodelocaldns else coredns_server )| list | join(' ') }} |
|
|
|
FallbackDNS={{ ( nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} |
|
|
|
{% endif %} |
|
|
|
FallbackDNS={{ ( upstream_dns_servers|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} |
|
|
|
Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }} |
|
|
|
#LLMNR=no |
|
|
|
#MulticastDNS=no |
|
|
|