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

Revert "Fix for unknown 'kubernetes.io' or 'k8s.io' labels specified with --node-labels (#4320)" (#4553)

Browse Source 
This reverts commit 586ad89d50.
This commit is contained in:
Maxime Guyot
2019-04-17 16:58:06 +02:00
committed by Kubernetes Prow Robot
parent 1cf76a10db
commit ec3daedf9e
18 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes-apps/policy_controller/calico/templates/calico-kube-controllers.yml.j2
View File

@@ -29,7 +29,7 @@ spec:
tolerations:
- key: CriticalAddonsOnly
operator: Exists
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
{% if kube_version is version('v1.11.1', '>=') %}
priorityClassName: system-cluster-critical