From dffeab320e571406814419a83db7d3f2227e401e Mon Sep 17 00:00:00 2001 From: Emin AKTAS Date: Tue, 4 Oct 2022 16:22:17 +0300 Subject: [PATCH] feat: add a paramater to disable host nameservers (#9357) Signed-off-by: eminaktas Signed-off-by: eminaktas --- inventory/sample/group_vars/all/all.yml | 5 +++++ roles/kubernetes/preinstall/tasks/0040-set_facts.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/inventory/sample/group_vars/all/all.yml b/inventory/sample/group_vars/all/all.yml index 5b0ca479f..b9639a8a8 100644 --- a/inventory/sample/group_vars/all/all.yml +++ b/inventory/sample/group_vars/all/all.yml @@ -35,6 +35,11 @@ loadbalancer_apiserver_healthcheck_port: 8081 ### OTHER OPTIONAL VARIABLES +## By default, Kubespray collects nameservers on the host. It then adds the previously collected nameservers in nameserverentries. +## If true, Kubespray does not include host nameservers in nameserverentries in dns_late stage. However, It uses the nameserver to make sure cluster installed safely in dns_early stage. +## Use this option with caution, you may need to define your dns servers. Otherwise, the outbound queries such as www.google.com may fail. +# disable_host_nameservers: false + ## Upstream dns servers # upstream_dns_servers: # - 8.8.8.8 diff --git a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml index ab433be4e..a69cb4b7f 100644 --- a/roles/kubernetes/preinstall/tasks/0040-set_facts.yml +++ b/roles/kubernetes/preinstall/tasks/0040-set_facts.yml @@ -201,7 +201,7 @@ - name: generate nameservers for resolvconf, including cluster DNS set_fact: 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(',') }} + {{ (([nodelocaldns_ip] if enable_nodelocaldns else []) + (coredns_server|d([]) if not enable_nodelocaldns else []) + nameservers|d([]) + cloud_resolver|d([]) + (configured_nameservers|d([]) if not disable_host_nameservers|d()|bool else [])) | unique | join(',') }} supersede_nameserver: 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