From be3283c9bade786cbccdffa56bdfd82f252d132d Mon Sep 17 00:00:00 2001
From: jeanfabrice <github@bobo-rousselin.com>
Date: Fri, 29 May 2020 13:27:15 +0200
Subject: [PATCH] Fix conflicting clusterIP fact between coredns and
nodelocaldns (#6195)
---
roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml b/roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml
index 62908eb05..3e379c9b1 100644
--- a/roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml
+++ b/roles/kubernetes-apps/ansible/tasks/nodelocaldns.yml
@@ -1,7 +1,7 @@
---
- name: Kubernetes Apps | set up necessary nodelocaldns parameters
set_fact:
- clusterIP: >-
+ primaryClusterIP: >-
{%- if dns_mode in ['coredns', 'coredns_dual'] -%}
{{ skydns_server }}
{%- elif dns_mode == 'manual' -%}
@@ -21,9 +21,9 @@
vars:
forwardTarget: >-
{%- if secondaryclusterIP is defined and dns_mode == 'coredns_dual' -%}
- {{ clusterIP }} {{ secondaryclusterIP }}
+ {{ primaryClusterIP }} {{ secondaryclusterIP }}
{%- else -%}
- {{ clusterIP }}
+ {{ primaryClusterIP }}
{%- endif -%}
upstreamForwardTarget: >-
{%- if resolvconf_mode == 'host_resolvconf' and upstream_dns_servers is defined and upstream_dns_servers|length > 0 -%}
--
GitLab