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

Merge pull request #2930 from alvistack/ingress-nginx-0.16.1

Browse Source 
ingress-nginx: Upgrade to 0.16.2
This commit is contained in:
Rong Zhang
2018-07-10 14:42:37 +08:00
committed by GitHub
parent 72f053d9bb a0defefb3f
commit cf445fd4fe
20 changed files with 82 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,9 +75,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% else %}
{% set dummy = role_node_labels.append('node-role.kubernetes.io/node=true') %}
{% endif %}
{% if inventory_hostname in groups['kube-ingress']|default([]) %}
{% set dummy = role_node_labels.append('node-role.kubernetes.io/ingress=true') %}
{% endif %}
{% set inventory_node_labels = [] %}
{% if node_labels is defined %}
{% for labelname, labelvalue in node_labels.iteritems() %}

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

@@ -91,9 +91,6 @@ KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% else %}
{% set dummy = role_node_labels.append('node-role.kubernetes.io/node=true') %}
{% endif %}
{% if inventory_hostname in groups['kube-ingress']|default([]) %}
{% set dummy = role_node_labels.append('node-role.kubernetes.io/ingress=true') %}
{% endif %}
{% set inventory_node_labels = [] %}
{% if node_labels is defined %}
{% for labelname, labelvalue in node_labels.iteritems() %}