epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-13 21:34:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

kubernetes/preinstall: switch coredns_server to vars/

Browse Source
This commit is contained in:
Max Gautier
2024-12-18 21:58:13 +01:00
parent 180ce0b2ce
commit a3e569f5c4
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
roles/kubernetes/preinstall/tasks/0020-set_facts.yml
View File

@@ -162,21 +162,6 @@
supersede_domain:
supersede domain-name "{{ dns_domain }}";
- name: Pick coredns cluster IP or default resolver
set_fact:
coredns_server: |-
{%- if dns_mode == 'coredns' and not dns_early | bool -%}
{{ [skydns_server] }}
{%- elif dns_mode == 'coredns_dual' and not dns_early | bool -%}
{{ [skydns_server] + [skydns_server_secondary] }}
{%- elif dns_mode == 'manual' and not dns_early | bool -%}
{{ (manual_dns_server.split(',') | list) }}
{%- elif dns_mode == 'none' and not dns_early | bool -%}
[]
{%- elif dns_early | bool -%}
{{ upstream_dns_servers | default([]) }}
{%- endif -%}
# This task should only run after cluster/nodelocal DNS is up, otherwise all DNS lookups will timeout
- name: Generate nameservers for resolvconf, including cluster DNS
set_fact:

7
roles/kubernetes/preinstall/vars/main.yml
View File

@@ -70,3 +70,10 @@ pkgs:
tar: []
unzip: []
xfsprogs: []
coredns_server_by_mode:
coredns: "{{ [skydns_server] }}"
coredns_dual: "{{ [skydns_server, skydns_server_secondary] }}"
manual: "{{ manual_dns_server.split(',') }}"
none: []
coredns_server: "{{ upstream_dns_server if dns_early else coredns_server_by_mode[dns_mode] }}"