Skip to content

Commit d444a2f

Browse files
authored
[systemd-resolved] Fix DNS configuration according to docs/dns-stack.md and during reset of cluster (kubernetes-sigs#8560) (kubernetes-sigs#8561)
1 parent fb7c56e commit d444a2f

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

reset.yml

+1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@
3232
environment: "{{ proxy_disable_env }}"
3333
roles:
3434
- { role: kubespray-defaults}
35+
- { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_early: true }
3536
- { role: reset, tags: reset }

roles/kubernetes/preinstall/templates/resolved.conf.j2

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
[Resolve]
2+
{% if dns_early is sameas true and dns_late is sameas false %}
3+
#DNS=
4+
{% else %}
25
DNS={{ ([nodelocaldns_ip] if enable_nodelocaldns else coredns_server )| list | join(' ') }}
3-
FallbackDNS={{ ( nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }}
6+
{% endif %}
7+
FallbackDNS={{ ( upstream_dns_servers|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }}
48
Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }}
59
#LLMNR=no
610
#MulticastDNS=no

0 commit comments

Comments
 (0)