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

Align node-role value for kubeadm compatibility (#3558)

Browse Source 
kubeadm sets node label node-role.kubernetes.io/master=''
and this is not configurable. We should use it everywhere.
This commit is contained in:
Matthew Mosesohn
2018-10-20 17:12:54 +03:00
committed by k8s-ci-robot
parent 4b711e29ef
commit 127969d65f
7 changed files with 11 additions and 11 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

@@ -27,7 +27,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node-role.kubernetes.io/master: "true"
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.yml.j2
View File

@@ -23,7 +23,7 @@ spec:
hostNetwork: true
hostPID: true
nodeSelector:
node-role.kubernetes.io/master: "true"
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

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