Browse Source

kubernetes/preinstall: dns vars cleanup

- Move validation from facts to verify-settings
- Move set_fact to vars/
pull/11819/head
Max Gautier 4 months ago
parent
commit
55e095c1c7
Failed to extract signature
3 changed files with 16 additions and 23 deletions
  1. 28
      roles/kubernetes/preinstall/tasks/0020-set_facts.yml
  2. 9
      roles/kubernetes/preinstall/tasks/0040-verify-settings.yml
  3. 2
      roles/kubernetes/preinstall/vars/main.yml

28
roles/kubernetes/preinstall/tasks/0020-set_facts.yml

@ -33,30 +33,12 @@
failed_when: false
register: resolvconf_stat
# Used in vars/
- name: Fetch resolvconf
when: resolvconf_stat.stat.exists is defined and resolvconf_stat.stat.exists
block:
- name: Get content of /etc/resolv.conf
slurp:
src: /etc/resolv.conf
register: resolvconf_slurp
- name: Get currently configured nameservers
set_fact:
configured_nameservers: "{{ resolvconf_slurp.content | b64decode | regex_findall('^nameserver\\s*(\\S*)', multiline=True) | ansible.utils.ipaddr }}"
when: resolvconf_slurp.content is defined
- name: Stop if /etc/resolv.conf not configured nameservers
assert:
that: configured_nameservers | length>0
fail_msg: "nameserver should not empty in /etc/resolv.conf"
when:
- not ignore_assert_errors
- configured_nameservers is defined
- not (upstream_dns_servers is defined and upstream_dns_servers | length > 0)
- not (disable_host_nameservers | default(false))
- dns_mode in ['coredns', 'coredns_dual']
when: resolvconf_stat.stat.exists
slurp:
src: /etc/resolv.conf
register: resolvconf_slurp
- name: NetworkManager | Check if host has NetworkManager
# noqa command-instead-of-module - Should we use service_facts for this?

9
roles/kubernetes/preinstall/tasks/0040-verify-settings.yml

@ -220,6 +220,15 @@
when: dns_mode is defined
run_once: true
- name: Stop if /etc/resolv.conf has no configured nameservers
assert:
that: configured_nameservers | length>0
fail_msg: "nameserver should not empty in /etc/resolv.conf"
when:
- upstream_dns_servers | length == 0
- not disable_host_nameservers
- dns_mode in ['coredns', 'coredns_dual']
- name: Stop if unknown kube proxy mode
assert:
that: kube_proxy_mode in ['iptables', 'ipvs']

2
roles/kubernetes/preinstall/vars/main.yml

@ -90,3 +90,5 @@ dhclient_supersede:
domain-name-servers: "{{ ([nameservers, cloud_resolver] | flatten | unique) if dns_early else nameserverentries }}"
domain-name: "{{ [dns_domain] }}"
domain-search: "{{ default_searchdomains + searchdomains }}"
configured_nameservers: "{{ (resolvconf_slurp.content | b64decode | regex_findall('^nameserver\\s*(\\S*)', multiline=True) | ansible.utils.ipaddr)
if resolvconf_stat.stat.exists else [] }}"
Loading…
Cancel
Save