External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-18 19:50: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/network_plugin/contiv/templates/contiv-api-proxy.yml.j2
View File

@@ -24,7 +24,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node.kubernetes.io/master: ""
node-role.kubernetes.io/master: ""
tolerations:
- operator: Exists
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)

2
roles/network_plugin/contiv/templates/contiv-etcd-proxy.yml.j2
View File

@@ -21,7 +21,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node.kubernetes.io/node: ""
node-role.kubernetes.io/node: ""
containers:
- name: contiv-etcd-proxy
image: {{ contiv_etcd_image_repo }}:{{ contiv_etcd_image_tag }}

2
roles/network_plugin/contiv/templates/contiv-etcd.yml.j2
View File

@@ -21,7 +21,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node.kubernetes.io/master: ""
node-role.kubernetes.io/master: ""
tolerations:
- operator: Exists
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)

2
roles/network_plugin/contiv/templates/contiv-netmaster.yml.j2
View File

@@ -24,7 +24,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node.kubernetes.io/master: ""
node-role.kubernetes.io/master: ""
tolerations:
- operator: Exists
# Mark pod as critical for rescheduling (Will have no effect starting with kubernetes 1.12)