External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-03 18:48:17 -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

6
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View File

@@ -85,12 +85,12 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{# Kubelet node labels #}
{% set role_node_labels = [] %}
{% if inventory_hostname in groups['kube-master'] %}
{% set dummy = role_node_labels.append("node.kubernetes.io/master=''") %}
{% set dummy = role_node_labels.append("node-role.kubernetes.io/master=''") %}
{% if not standalone_kubelet|bool %}
{% set dummy = role_node_labels.append("node.kubernetes.io/node=''") %}
{% set dummy = role_node_labels.append("node-role.kubernetes.io/node=''") %}
{% endif %}
{% else %}
{% set dummy = role_node_labels.append("node.kubernetes.io/node=''") %}
{% set dummy = role_node_labels.append("node-role.kubernetes.io/node=''") %}
{% endif %}
{% if nvidia_gpu_nodes is defined and nvidia_accelerator_enabled|bool %}
{% if inventory_hostname in nvidia_gpu_nodes %}