Fix conflicting clusterIP fact between coredns and nodelocaldns (#6195)

This commit is contained in:
jeanfabrice 2020-05-29 13:27:15 +02:00 committed by GitHub
parent 249b0a2a80
commit be3283c9ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,7 @@
--- ---
- name: Kubernetes Apps | set up necessary nodelocaldns parameters - name: Kubernetes Apps | set up necessary nodelocaldns parameters
set_fact: set_fact:
clusterIP: >- primaryClusterIP: >-
{%- if dns_mode in ['coredns', 'coredns_dual'] -%} {%- if dns_mode in ['coredns', 'coredns_dual'] -%}
{{ skydns_server }} {{ skydns_server }}
{%- elif dns_mode == 'manual' -%} {%- elif dns_mode == 'manual' -%}
@ -21,9 +21,9 @@
vars: vars:
forwardTarget: >- forwardTarget: >-
{%- if secondaryclusterIP is defined and dns_mode == 'coredns_dual' -%} {%- if secondaryclusterIP is defined and dns_mode == 'coredns_dual' -%}
{{ clusterIP }} {{ secondaryclusterIP }} {{ primaryClusterIP }} {{ secondaryclusterIP }}
{%- else -%} {%- else -%}
{{ clusterIP }} {{ primaryClusterIP }}
{%- endif -%} {%- endif -%}
upstreamForwardTarget: >- upstreamForwardTarget: >-
{%- if resolvconf_mode == 'host_resolvconf' and upstream_dns_servers is defined and upstream_dns_servers|length > 0 -%} {%- if resolvconf_mode == 'host_resolvconf' and upstream_dns_servers is defined and upstream_dns_servers|length > 0 -%}