C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dns-autoscaler.yml.j2 (#4857)

Browse source 
Merge two tolerations.  because the latest tolerations will cover the first tolerations.
This commit is contained in:
AlawnWong 2019-06-10 02:39:04 +08:00 committed by Kubernetes Prow Robot
parent fa791cc344
commit 69a8f91512
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View file

@ -46,6 +46,8 @@ spec:
- effect: NoSchedule - effect: NoSchedule
operator: Equal operator: Equal
key: node-role.kubernetes.io/master key: node-role.kubernetes.io/master
- key: "CriticalAddonsOnly"
operator: "Exists"
affinity: affinity:
podAntiAffinity: podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
@ -77,7 +79,4 @@ spec:
- --v=2 - --v=2
- --configmap=dns-autoscaler{{ coredns_ordinal_suffix }} - --configmap=dns-autoscaler{{ coredns_ordinal_suffix }}
- --target=Deployment/coredns{{ coredns_ordinal_suffix }} - --target=Deployment/coredns{{ coredns_ordinal_suffix }}
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
serviceAccountName: dns-autoscaler serviceAccountName: dns-autoscaler