From 69a8f915120f81b58c528253e1b1b1d8ae3532df Mon Sep 17 00:00:00 2001
From: AlawnWong <coolstar007@126.com>
Date: Mon, 10 Jun 2019 02:39:04 +0800
Subject: [PATCH] Update dns-autoscaler.yml.j2 (#4857)
Merge two tolerations. because the latest tolerations will cover the first tolerations.
---
.../kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2 b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
index df9bd3623..9cacf6079 100644
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -46,6 +46,8 @@ spec:
- effect: NoSchedule
operator: Equal
key: node-role.kubernetes.io/master
+ - key: "CriticalAddonsOnly"
+ operator: "Exists"
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -77,7 +79,4 @@ spec:
- --v=2
- --configmap=dns-autoscaler{{ coredns_ordinal_suffix }}
- --target=Deployment/coredns{{ coredns_ordinal_suffix }}
- tolerations:
- - key: "CriticalAddonsOnly"
- operator: "Exists"
serviceAccountName: dns-autoscaler
--
GitLab