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

2026-03-09 19:58:07 +03:00 · 2021-01-21 17:13:03 +01:00
parent 24ceee134e
commit 222a77dfe7
16 changed files with 68 additions and 6 deletions
--- a/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
+++ b/roles/kubernetes-apps/ansible/templates/dns-autoscaler.yml.j2
@@ -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:
                - ""