From 97764921ed9588be42e61bb463c8b1833b9fba49 Mon Sep 17 00:00:00 2001 From: Jacopo Secchiero Date: Mon, 11 Nov 2019 13:01:41 +0100 Subject: [PATCH] Fix calico name resolution (#5291) --- .../calico/templates/calico-kube-controllers.yml.j2 | 1 - roles/network_plugin/calico/templates/calico-node.yml.j2 | 1 - roles/network_plugin/calico/templates/calico-typha.yml.j2 | 1 - 3 files changed, 3 deletions(-) diff --git a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 index 84e057de9..628e02671 100644 --- a/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 +++ b/roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2 @@ -25,7 +25,6 @@ spec: nodeSelector: beta.kubernetes.io/os: linux hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet serviceAccountName: calico-kube-controllers tolerations: - key: CriticalAddonsOnly diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2 index 62d4f7bd3..8a0ea9e5b 100644 --- a/roles/network_plugin/calico/templates/calico-node.yml.j2 +++ b/roles/network_plugin/calico/templates/calico-node.yml.j2 @@ -27,7 +27,6 @@ spec: spec: priorityClassName: system-node-critical hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet serviceAccountName: calico-node tolerations: - effect: NoExecute diff --git a/roles/network_plugin/calico/templates/calico-typha.yml.j2 b/roles/network_plugin/calico/templates/calico-typha.yml.j2 index 3efd9fe50..4826387b3 100644 --- a/roles/network_plugin/calico/templates/calico-typha.yml.j2 +++ b/roles/network_plugin/calico/templates/calico-typha.yml.j2 @@ -54,7 +54,6 @@ spec: nodeSelector: beta.kubernetes.io/os: linux hostNetwork: true - dnsPolicy: ClusterFirstWithHostNet tolerations: # Mark the pod as a critical add-on for rescheduling. - key: CriticalAddonsOnly