From becb6267fb6b05ce8518c52ea1728931299e1b51 Mon Sep 17 00:00:00 2001 From: yun Date: Tue, 31 Oct 2023 00:37:52 +0800 Subject: [PATCH] Set default remove_default_searchdomains to false (#10533) --- roles/kubernetes/preinstall/templates/resolved.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/preinstall/templates/resolved.conf.j2 b/roles/kubernetes/preinstall/templates/resolved.conf.j2 index 0a3b40d84..7c47b0b28 100644 --- a/roles/kubernetes/preinstall/templates/resolved.conf.j2 +++ b/roles/kubernetes/preinstall/templates/resolved.conf.j2 @@ -5,10 +5,10 @@ DNS={{ ([nodelocaldns_ip] if enable_nodelocaldns else coredns_server )| list | join(' ') }} {% endif %} FallbackDNS={{ ( upstream_dns_servers|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(' ') }} -{% if remove_default_searchdomains is sameas false or (remove_default_searchdomains is sameas true and searchdomains|default([])|length==0)%} -Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }} -{% else %} +{% if remove_default_searchdomains is sameas true and searchdomains|default([])|length != 0 %} Domains={{ searchdomains|default([]) | join(' ') }} +{% else %} +Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }} {% endif %} #LLMNR=no #MulticastDNS=no