From f599a4a85916b27054ba175ade8328ee4b093951 Mon Sep 17 00:00:00 2001
From: Matthew Mosesohn <matthew.mosesohn@gmail.com>
Date: Mon, 2 Dec 2019 19:41:05 +0300
Subject: [PATCH] force other resolvers to be secondary when using
systemd-resolved (#5391)
Change-Id: I33d46c7e0c5374467e22c5a652b282d1703dea85
---
roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 6 +++---
roles/kubernetes/preinstall/templates/resolved.conf.j2 | 8 ++------
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml
index 73b751589..9f05309db 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 6aac1a640..57e6d6348 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
--
GitLab