Merge pull request openshift#342 from elmiko/update-azure-tolerations

OCPBUGS-33405: update azure and ash tolerations on node manager

Author: openshift-merge-bot[bot]

pkg/cloud/azure/assets/cloud-node-manager-daemonset.yaml

@@ -34,6 +34,9 @@ spec:
       tolerations:
         - effect: NoSchedule
           operator: Exists
+        - effect: NoExecute
+          key: node-role.kubernetes.io/infra
+          operator: Exists
         - effect: NoExecute
           key: node.kubernetes.io/unreachable
           operator: Exists

pkg/cloud/azurestack/assets/cloud-node-manager-daemonset.yaml

@@ -33,7 +33,9 @@ spec:
         kubernetes.io/os: linux
       tolerations:
         - effect: NoSchedule
-          key: node-role.kubernetes.io/master
+          operator: Exists
+        - effect: NoExecute
+          key: node-role.kubernetes.io/infra
           operator: Exists
         - effect: NoExecute
           key: node.kubernetes.io/unreachable
@@ -43,12 +45,6 @@ spec:
           key: node.kubernetes.io/not-ready
           operator: Exists
           tolerationSeconds: 120
-        - effect: NoSchedule
-          key: node.cloudprovider.kubernetes.io/uninitialized
-          operator: Exists
-        - effect: NoSchedule
-          key: node.kubernetes.io/not-ready
-          operator: Exists
       initContainers:
         - name: azure-inject-credentials
           image: {{ .images.Operator }}