force other resolvers to be secondary when using systemd-resolved (#5391)

Change-Id: I33d46c7e0c5374467e22c5a652b282d1703dea85

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 -%}

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