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

Change node-role.kubernetes.io from master to control-plane (#7183)

Browse Source
This commit is contained in:
Florian Ruynat
2021-01-21 17:13:03 +01:00
committed by GitHub
parent 24ceee134e
commit 222a77dfe7
16 changed files with 68 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubernetes-apps/ansible/templates/coredns-deployment.yml.j2
View File

@@ -31,6 +31,8 @@ spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% if dns_extra_tolerations | default(None) %}
{{ dns_extra_tolerations | list | to_nice_yaml(indent=2) | indent(8) }}
{% endif %}
@@ -46,7 +48,11 @@ spec:
- weight: 100
preference:
matchExpressions:
{% if kube_version is version('v1.20.0', '<') %}
- key: node-role.kubernetes.io/master
{% else %}
- key: node-role.kubernetes.io/control-plane
{% endif %}
operator: In
values:
- ""

4
roles/kubernetes-apps/ansible/templates/dashboard.yml.j2
View File

@@ -219,6 +219,8 @@ spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}
---
@@ -316,4 +318,6 @@ spec:
tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
{% endif %}

7
roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
View File

@@ -40,8 +40,9 @@ spec:
kubernetes.io/os: linux
tolerations:
- effect: NoSchedule
operator: Equal
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
affinity:
podAntiAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
@@ -54,7 +55,11 @@ spec:
- weight: 100
preference:
matchExpressions:
{% if kube_version is version('v1.20.0', '<') %}
- key: node-role.kubernetes.io/master
{% else %}
- key: node-role.kubernetes.io/control-plane
{% endif %}
operator: In
values:
- ""