From 0ab7b99a960d8cc6d29296c8ea8124e17e268364 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Wed, 19 Apr 2017 19:08:49 +0200 Subject: [PATCH] Use ClusterFirstWithHostNet only when not dns_early On early stage we'll use default DNS policy. Then we'll use ClusterFirstWithHostNet policy once dnsmasq is set up Signed-off-by: Sergii Golovatiuk --- .../templates/manifests/kube-controller-manager.manifest.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 index b483047db..1e06d0c42 100644 --- a/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 +++ b/roles/kubernetes/master/templates/manifests/kube-controller-manager.manifest.j2 @@ -7,7 +7,7 @@ metadata: k8s-app: kube-controller spec: hostNetwork: true -{% if kube_version | version_compare('v1.6', '>=') %} +{% if kube_version | version_compare('v1.6', '>=') and not dns_early|bool %} dnsPolicy: ClusterFirstWithHostNet {% endif %} containers: