From 0d57176f40f90ce41f1747448ebe932e8b3077ee Mon Sep 17 00:00:00 2001 From: Justin SB Date: Fri, 9 Nov 2018 09:25:35 -0500 Subject: [PATCH] CoreDNS should respect user taints Otherwise users will be surprised when CoreDNS starts running on their masters, where kube-dns did not. Issue #70851 --- cluster/addons/dns/coredns/coredns.yaml.base | 2 -- cluster/addons/dns/coredns/coredns.yaml.in | 2 -- cluster/addons/dns/coredns/coredns.yaml.sed | 2 -- 3 files changed, 6 deletions(-) diff --git a/cluster/addons/dns/coredns/coredns.yaml.base b/cluster/addons/dns/coredns/coredns.yaml.base index 35e14918a1b..54238f3f7b6 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.base +++ b/cluster/addons/dns/coredns/coredns.yaml.base @@ -108,8 +108,6 @@ spec: spec: serviceAccountName: coredns tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: "CriticalAddonsOnly" operator: "Exists" containers: diff --git a/cluster/addons/dns/coredns/coredns.yaml.in b/cluster/addons/dns/coredns/coredns.yaml.in index 245a00d4f39..1ed40f53e4d 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.in +++ b/cluster/addons/dns/coredns/coredns.yaml.in @@ -108,8 +108,6 @@ spec: spec: serviceAccountName: coredns tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: "CriticalAddonsOnly" operator: "Exists" containers: diff --git a/cluster/addons/dns/coredns/coredns.yaml.sed b/cluster/addons/dns/coredns/coredns.yaml.sed index 00f18803093..3ff5efeddab 100644 --- a/cluster/addons/dns/coredns/coredns.yaml.sed +++ b/cluster/addons/dns/coredns/coredns.yaml.sed @@ -108,8 +108,6 @@ spec: spec: serviceAccountName: coredns tolerations: - - key: node-role.kubernetes.io/master - effect: NoSchedule - key: "CriticalAddonsOnly" operator: "Exists" containers: