epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 09:39:12 +03:00
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

4
roles/kubernetes-apps/metrics_server/templates/metrics-server-deployment.yaml.j2
View File

@@ -116,7 +116,7 @@ spec:
name: metrics-server-config
{% if not masters_are_not_tainted %}
tolerations:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: "CriticalAddonsOnly"
operator: "Exists"
@@ -127,7 +127,7 @@ spec:
- weight: 100
preference:
matchExpressions:
- key: node.kubernetes.io/master
- key: node-role.kubernetes.io/master
operator: In
values:
- ""