From 4ff851b302e82b514ca8f7dc09c9e5f88d590781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BCger?= <ak@patientsky.com>
Date: Thu, 11 Apr 2019 09:24:08 +0200
Subject: [PATCH] Enable nodelocaldns by default (#4461)

* Enable nodelocaldns by default

* Enable nodelocaldns by default

* nodelocaldns is now default

* Disable enable_nodelocaldns for the addons CI jobs

Disable enable_nodelocaldns for the addons CI jobs to make sure things still work without nodelocaldns
---
 inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml | 2 +-
 roles/kubespray-defaults/defaults/main.yaml             | 2 +-
 tests/files/gce_centos7-flannel-addons.yml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
index e24caef35..11a22af3a 100644
--- a/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
+++ b/inventory/sample/group_vars/k8s-cluster/k8s-cluster.yml
@@ -132,7 +132,7 @@ dns_mode: coredns
 # Set manual server if using a custom cluster DNS server
 # manual_dns_server: 10.x.x.x
 # Enable nodelocal dns cache
-enable_nodelocaldns: False
+enable_nodelocaldns: true
 nodelocaldns_ip: 169.254.25.10
 
 # Can be docker_dns, host_resolvconf or none
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 0d59873b3..205362c3e 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -62,7 +62,7 @@ ndots: 2
 dns_mode: coredns
 
 # Enable nodelocal dns cache
-enable_nodelocaldns: False
+enable_nodelocaldns: true
 nodelocaldns_ip: 169.254.25.10
 
 # Should be set to a cluster IP if using a custom cluster DNS
diff --git a/tests/files/gce_centos7-flannel-addons.yml b/tests/files/gce_centos7-flannel-addons.yml
index 5ff0f3045..b4984c636 100644
--- a/tests/files/gce_centos7-flannel-addons.yml
+++ b/tests/files/gce_centos7-flannel-addons.yml
@@ -21,5 +21,5 @@ cert_manager_enabled: true
 metrics_server_enabled: true
 kube_token_auth: true
 kube_basic_auth: true
-enable_nodelocaldns: true
+enable_nodelocaldns: false
 local_path_provisioner_enabled: true
-- 
GitLab