epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-09 03:37:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename default_resolver to cloud_resolver (#2209)

Browse Source 
Cloud resolvers are mandatory for hosts on GCE and OpenStack
clouds. The 8.8.8.8 alternative resolver was dropped because
there is already a default nameserver. The new var name
reflects the purpose better.

Also restart apiserver when modifying dns settings.
This commit is contained in:
Matthew Mosesohn
2018-01-31 00:26:07 +03:00
committed by GitHub
parent 3846384d56
commit 2df4b6c5d2
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
roles/kubernetes/preinstall/tasks/set_resolv_facts.yml
View File

@@ -15,13 +15,13 @@
{% for d in [ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([]) -%}
{{dns_domain}}.{{d}}./{{d}}.{{d}}./com.{{d}}./
{%- endfor %}
default_resolver: >-
cloud_resolver: >-
{%- if cloud_provider is defined and cloud_provider == 'gce' -%}
169.254.169.254
['169.254.169.254']
{%- elif cloud_provider is defined and cloud_provider == 'aws' -%}
169.254.169.253
['169.254.169.253']
{%- else -%}
8.8.8.8
[]
{%- endif -%}
- name: check if kubelet is configured
@@ -106,6 +106,6 @@
- name: generate nameservers to resolvconf
set_fact:
nameserverentries:
nameserver {{( dnsmasq_server + nameservers|default([default_resolver])) | join(',nameserver ')}}
nameserver {{( dnsmasq_server + nameservers|d([]) + cloud_resolver|d([])) | join(',nameserver ')}}
supersede_nameserver:
supersede domain-name-servers {{( dnsmasq_server + nameservers|default([default_resolver])) | join(', ') }};
supersede domain-name-servers {{( dnsmasq_server + nameservers|d([]) + cloud_resolver|d([])) | join(', ') }};