diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml index 73b7515894281933e7d5bedc7d9b8e56afbedae2..9f05309db4a513b1873dfcfd113f73f50690a8db 100644 --- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml @@ -137,11 +137,11 @@ set_fact: coredns_server: |- {%- if dns_mode == 'coredns' and not dns_early|bool -%} - {{ [ skydns_server ] + upstream_dns_servers|default([]) }} + {{ [ skydns_server ] }} {%- elif dns_mode == 'coredns_dual' and not dns_early|bool -%} - {{ [ skydns_server ] + [ skydns_server_secondary ] + upstream_dns_servers|default([]) }} + {{ [ skydns_server ] + [ skydns_server_secondary ] }} {%- elif dns_mode == 'manual' and not dns_early|bool -%} - {{ ( manual_dns_server.split(',') | list) + upstream_dns_servers|default([]) }} + {{ ( manual_dns_server.split(',') | list) }} {%- elif dns_early|bool -%} {{ upstream_dns_servers|default([]) }} {%- endif -%} diff --git a/roles/kubernetes/preinstall/templates/resolved.conf.j2 b/roles/kubernetes/preinstall/templates/resolved.conf.j2 index 6aac1a640de7461c55b7993c72c2becd786beff2..57e6d63480fb6b92a447ea5c6e3b7ddfb7618594 100644 --- a/roles/kubernetes/preinstall/templates/resolved.conf.j2 +++ b/roles/kubernetes/preinstall/templates/resolved.conf.j2 @@ -1,10 +1,6 @@ [Resolve] -{% if dns_late %} -DNS={{ ( coredns_server + nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} -{% else %} -DNS={{ ( nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} -{% endif %} -#FallbackDNS= +DNS={{ coredns_server | list | join(' ') }} +FallbackDNS={{ ( nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }} #LLMNR=no #MulticastDNS=no