Revert "Fix for unknown 'kubernetes.io' or 'k8s.io' labels specified with --node-labels (#4320)" (#4553)

This reverts commit 586ad89d50.

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

@@ -30,7 +30,7 @@ spec:
         beta.kubernetes.io/os: linux
       serviceAccountName: coredns
       tolerations:
-        - key: node.kubernetes.io/master
+        - key: node-role.kubernetes.io/master
           effect: NoSchedule
         - key: "CriticalAddonsOnly"
           operator: "Exists"
@@ -46,7 +46,7 @@ spec:
           - weight: 100
             preference:
               matchExpressions:
-              - key: node.kubernetes.io/master
+              - key: node-role.kubernetes.io/master
                 operator: In
                 values:
                 - ""

roles/kubernetes-apps/ansible/templates/dashboard.yml.j2

@@ -195,7 +195,7 @@ spec:
       serviceAccountName: kubernetes-dashboard
 {% if dashboard_master_toleration %}
       tolerations:
-      - key: node.kubernetes.io/master
+      - key: node-role.kubernetes.io/master
         effect: NoSchedule
 {% endif %}
 

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

@@ -45,7 +45,7 @@ spec:
       tolerations:
         - effect: NoSchedule
           operator: Equal
-          key: node.kubernetes.io/master
+          key: node-role.kubernetes.io/master
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -58,7 +58,7 @@ spec:
           - weight: 100
             preference:
               matchExpressions:
-              - key: node.kubernetes.io/master
+              - key: node-role.kubernetes.io/master
                 operator: In
                 values:
                 - ""