From f87eac6177f2d48319d3fab8ad8c75a767c26a76 Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Thu, 18 Jul 2019 10:33:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:ubuntu1804=E5=AE=89=E8=A3=85=E9=9B=86?=
 =?UTF-8?q?=E7=BE=A4kubedns/coredns=E8=BD=AC=E5=8F=91=E5=88=B0node?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9/etc/resolv.conf=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 roles/kube-node/templates/kubelet-config.yaml.j2 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/kube-node/templates/kubelet-config.yaml.j2 b/roles/kube-node/templates/kubelet-config.yaml.j2
index b9c39d7..a32a2c4 100644
--- a/roles/kube-node/templates/kubelet-config.yaml.j2
+++ b/roles/kube-node/templates/kubelet-config.yaml.j2
@@ -63,7 +63,11 @@ oomScoreAdj: -999
 podPidsLimit: -1
 port: 10250
 readOnlyPort: 0
+{% if ansible_distribution_release == "bionic" %}
+resolvConf: /run/systemd/resolve/resolv.conf
+{% else %}
 resolvConf: /etc/resolv.conf
+{% endif %}
 runtimeRequestTimeout: 2m0s
 serializeImagePulls: true
 streamingConnectionIdleTimeout: 4h0m0s