Merge pull request #55 from openshift-cherrypick-robot/cherry-pick-52…

…-to-release-0.13 [release-0.13] Tolerate control-plane node taint
medik8s · Sep 8, 2022 · 49358be · 49358be
2 parents cbe9746 + 1eed661
commit 49358be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml b/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:

diff --git a/config/manager/manager.yaml b/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