diff --git a/CHANGELOG.md b/CHANGELOG.md index fc14d601c..3b8553bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s ## [Unreleased] +### Changed + +- Changed pod taint toleration to only tolerate `NotReady` for CAPI. + ## [2.35.0] - 2023-05-04 ### Changed diff --git a/helm/chart-operator/templates/deployment.yaml b/helm/chart-operator/templates/deployment.yaml index 0fc7526ee..f3951abd1 100644 --- a/helm/chart-operator/templates/deployment.yaml +++ b/helm/chart-operator/templates/deployment.yaml @@ -58,8 +58,17 @@ spec: {{- if or .Values.chartOperator.cni.install .Values.bootstrapMode.enabled }} hostNetwork: true tolerations: - - effect: NoSchedule + - key: node.kubernetes.io/not-ready + effect: NoSchedule operator: Exists + - key: node-role.kubernetes.io/control-plane + effect: NoSchedule + - key: node-role.kubernetes.io/master + effect: NoSchedule + - key: node.cloudprovider.kubernetes.io/uninitialized + effect: NoSchedule + - key: node.cluster.x-k8s.io/uninitialized + effect: NoSchedule {{- else }} tolerations: - key: node-role.kubernetes.io/control-plane