C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
inventory/sample/group_vars/k8s-cluster/addons.yml
View file

@ -44,7 +44,7 @@ cephfs_provisioner_enabled: false
ingress_nginx_enabled: false ingress_nginx_enabled: false
# ingress_nginx_host_network: false # ingress_nginx_host_network: false
# ingress_nginx_nodeselector: # ingress_nginx_nodeselector:
# node-role.kubernetes.io/master: "true" # node-role.kubernetes.io/master: ""
# ingress_nginx_namespace: "ingress-nginx" # ingress_nginx_namespace: "ingress-nginx"
# ingress_nginx_insecure_port: 80 # ingress_nginx_insecure_port: 80
# ingress_nginx_secure_port: 443 # ingress_nginx_secure_port: 443

2
roles/kubernetes-apps/ingress_controller/ingress_nginx/defaults/main.yml
View file

@ -2,7 +2,7 @@
ingress_nginx_namespace: "ingress-nginx" ingress_nginx_namespace: "ingress-nginx"
ingress_nginx_host_network: false ingress_nginx_host_network: false
ingress_nginx_nodeselector: ingress_nginx_nodeselector:
node-role.kubernetes.io/master: "true" node-role.kubernetes.io/master: ""
ingress_nginx_insecure_port: 80 ingress_nginx_insecure_port: 80
ingress_nginx_secure_port: 443 ingress_nginx_secure_port: 443
ingress_nginx_configmap: {} ingress_nginx_configmap: {}

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

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

6
roles/kubernetes/node/templates/kubelet.standard.env.j2
View file

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

2
roles/network_plugin/contiv/templates/contiv-api-proxy.yml.j2
View file

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