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

Merge pull request #2567 from mirwan/node_labels_doc_plus_kube_ingress_handling

Browse Source 
node_labels documentation and kube-ingress label definition as role_node_label
This commit is contained in:
Andreas Krüger
2018-03-31 18:05:52 +02:00
committed by GitHub
parent c1a2e9a8c6 8ece922ef0
commit 1ac978b8fa
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/kubernetes/node/templates/kubelet.standard.env.j2
View File

@@ -88,7 +88,7 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% do role_node_labels.append('node-role.kubernetes.io/node=true') %}
{% endif %}
{% elif inventory_hostname in groups['kube-ingress']|default([]) %}
{% set node_labels %}--node-labels=node-role.kubernetes.io/ingress=true{% endset %}
{% do role_node_labels.append('node-role.kubernetes.io/ingress=true') %}
{% else %}
{% do role_node_labels.append('node-role.kubernetes.io/node=true') %}
{% endif %}