Browse Source

Enable systemd-resolved DNS resolution mode (#5318)

Change-Id: If3e253a40782e03cde7fc4a91493517ae31fda17
pull/5321/head
Matthew Mosesohn 5 years ago
committed by Kubernetes Prow Robot
parent
commit
a005d19f6f
5 changed files with 44 additions and 0 deletions
  1. 5
      roles/kubernetes/preinstall/handlers/main.yml
  2. 7
      roles/kubernetes/preinstall/tasks/0040-set_facts.yml
  3. 9
      roles/kubernetes/preinstall/tasks/0061-systemd-resolved.yml
  4. 10
      roles/kubernetes/preinstall/tasks/main.yml
  5. 13
      roles/kubernetes/preinstall/templates/resolved.conf.j2

5
roles/kubernetes/preinstall/handlers/main.yml

@ -95,3 +95,8 @@
- inventory_hostname in groups['kube-master']
- dns_mode != 'none'
- resolvconf_mode == 'host_resolvconf'
- name: Preinstall | Restart systemd-resolved
service:
name: systemd-resolved
state: restarted

7
roles/kubernetes/preinstall/tasks/0040-set_facts.yml

@ -43,6 +43,13 @@
changed_when: false
check_mode: no
- name: check systemd-resolved
command: systemctl is-active systemd-resolved
register: systemd_resolved_enabled
failed_when: false
changed_when: false
check_mode: no
- name: set dns facts
set_fact:
resolvconf: >-

9
roles/kubernetes/preinstall/tasks/0061-systemd-resolved.yml

@ -0,0 +1,9 @@
---
- name: Write resolved.conf
template:
src: resolved.conf.j2
dest: /etc/systemd/resolved.conf
owner: root
group: root
mode: 0644
notify: Preinstall | Restart systemd-resolved

10
roles/kubernetes/preinstall/tasks/main.yml

@ -32,6 +32,16 @@
when:
- dns_mode != 'none'
- resolvconf_mode == 'host_resolvconf'
- systemd_resolved_enabled.rc != 0
tags:
- bootstrap-os
- resolvconf
- import_tasks: 0061-systemd-resolved.yml
when:
- dns_mode != 'none'
- resolvconf_mode == 'host_resolvconf'
- systemd_resolved_enabled.rc == 0
tags:
- bootstrap-os
- resolvconf

13
roles/kubernetes/preinstall/templates/resolved.conf.j2

@ -0,0 +1,13 @@
[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=
Domains={{ ([ 'default.svc.' + dns_domain, 'svc.' + dns_domain ] + searchdomains|default([])) | join(' ') }}
#LLMNR=no
#MulticastDNS=no
DNSSEC=no
Cache=no-negative
#DNSStubListener=yes
Loading…
Cancel
Save