From 1eed661c7ce74ef91ce2cf759a210b36d6c04ce5 Mon Sep 17 00:00:00 2001 From: Malte Poll Date: Tue, 30 Aug 2022 16:05:44 +0200 Subject: [PATCH] Tolerate control-plane taint Follow KEP 2067: https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint --- .../node-maintenance-operator.clusterserviceversion.yaml | 5 +++++ config/manager/manager.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml b/bundle/manifests/node-maintenance-operator.clusterserviceversion.yaml index 7c5700c2a..5fb7dc5cb 100644 --- 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 index ad20bf13d..a49ef8067 100644 --- 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