mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2025-12-14 05:45:06 +03:00
kubernetes/preinstall: switch coredns_server to vars/
This commit is contained in:
@@ -162,21 +162,6 @@
|
|||||||
supersede_domain:
|
supersede_domain:
|
||||||
supersede domain-name "{{ dns_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
|
# 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
|
- name: Generate nameservers for resolvconf, including cluster DNS
|
||||||
set_fact:
|
set_fact:
|
||||||
|
|||||||
@@ -70,3 +70,10 @@ pkgs:
|
|||||||
tar: []
|
tar: []
|
||||||
unzip: []
|
unzip: []
|
||||||
xfsprogs: []
|
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] }}"
|
||||||
|
|||||||
Reference in New Issue
Block a user