From 6dff39344b6b4b18e9d7283f54c5978e1101d870 Mon Sep 17 00:00:00 2001 From: Zhong Jianxin Date: Mon, 26 Sep 2022 11:19:44 +0800 Subject: [PATCH] preinstall: Add nodelocaldns to supersede_nameserver if enabled (#9282) When a machine that use dhclient and resolvconf reboots, this will make /etc/resolv.conf remain close to the one before reboot --- roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml index e3a36f010..ab433be4e 100644 --- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml @@ -203,7 +203,7 @@ nameserverentries: |- {{ (([nodelocaldns_ip] if enable_nodelocaldns else []) + (coredns_server|d([]) if not enable_nodelocaldns else []) + nameservers|d([]) + cloud_resolver|d([]) + configured_nameservers|d([])) | unique | join(',') }} supersede_nameserver: - supersede domain-name-servers {{ ( coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }}; + supersede domain-name-servers {{ ( ( [nodelocaldns_ip] if enable_nodelocaldns else []) + coredns_server|d([]) + nameservers|d([]) + cloud_resolver|d([])) | unique | join(', ') }}; when: not dns_early or dns_late # This task should run instead of the above task when cluster/nodelocal DNS hasn't