Merge pull request #55 from openshift-cherrypick-robot/cherry-pick-52-to-release-0.13

[release-0.13] Tolerate control-plane node taint

Author: openshift-merge-robot

bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml

@@ -230,6 +230,9 @@ spec:
                     - matchExpressions:
                       - key: node-role.kubernetes.io/master
                         operator: Exists
+                    - matchExpressions:
+                      - key: node-role.kubernetes.io/control-plane
+                        operator: Exists
               containers:
               - args:
                 - --health-probe-bind-address=:8081
@@ -277,6 +280,8 @@ spec:
               tolerations:
               - effect: NoSchedule
                 key: node-role.kubernetes.io/master
+              - effect: NoSchedule
+                key: node-role.kubernetes.io/control-plane
       permissions:
       - rules:
         - apiGroups:

config/manager/manager.yaml

@@ -31,9 +31,14 @@ spec:
               - matchExpressions:
                   - key: node-role.kubernetes.io/master
                     operator: Exists
+              - matchExpressions:
+                  - key: node-role.kubernetes.io/control-plane
+                    operator: Exists
       tolerations:
         - effect: NoSchedule
           key: node-role.kubernetes.io/master
+        - effect: NoSchedule
+          key: node-role.kubernetes.io/control-plane
       securityContext:
         runAsNonRoot: true
       priorityClassName: system-cluster-critical