External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-03-07 11:41:16 -03:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@@ -64,7 +64,6 @@ ci-authorized:
include:
- .gitlab-ci/lint.yml
- .gitlab-ci/shellcheck.yml
- .gitlab-ci/gce.yml
- .gitlab-ci/digital-ocean.yml
- .gitlab-ci/terraform.yml
- .gitlab-ci/packet.yml