Cherry pick #4857 #4859 #4867 into release-2.10 (#4877)

* fix start CoreDNS when init secondary master (#4867)

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

Merge two tolerations.  because the latest tolerations will cover the first tolerations.

* Remove GCE tests and CNCF funding ended (#4859)
This commit is contained in:
Andreas Holmsten
2019-06-13 14:22:17 +02:00
committed by Kubernetes Prow Robot
parent b90b1fc2b9
commit 7d8da8348e
3 changed files with 3 additions and 5 deletions

View File

@@ -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