From 4c45cdc9cf6c981da25fa3ddaf405f19ea1e638f Mon Sep 17 00:00:00 2001 From: Marco De Luca Date: Thu, 22 Jan 2026 17:13:58 +0100 Subject: [PATCH] Add additional toleration for node-role.kubernetes.io/control-plane:NoSchedule --- component/main.jsonnet | 12 +++++++++--- ...er_manager_exoscale_cloud_controller_manager.yaml | 2 ++ ...er_manager_exoscale_cloud_controller_manager.yaml | 2 ++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/component/main.jsonnet b/component/main.jsonnet index 2645350..00e79e7 100644 --- a/component/main.jsonnet +++ b/component/main.jsonnet @@ -86,9 +86,15 @@ local ccm = [ template+: { spec+: { nodeSelector: params.nodeSelector, - tolerations+: [ { - key: 'node.kubernetes.io/not-ready', - } ], + tolerations+: [ + { + key: 'node.kubernetes.io/not-ready', + }, + { + key: 'node-role.kubernetes.io/control-plane', + effect: 'NoSchedule', + }, + ], containers: [ super.containers[0] { image: diff --git a/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml b/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml index aff3a92..4d1f41f 100644 --- a/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml +++ b/tests/golden/defaults/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml @@ -52,3 +52,5 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master - key: node.kubernetes.io/not-ready + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane diff --git a/tests/golden/openshift/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml b/tests/golden/openshift/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml index aff3a92..4d1f41f 100644 --- a/tests/golden/openshift/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml +++ b/tests/golden/openshift/exoscale-cloud-controller-manager/exoscale-cloud-controller-manager/manager/20_ccm_deployment_syn_exoscale_cloud_controller_manager_exoscale_cloud_controller_manager.yaml @@ -52,3 +52,5 @@ spec: - effect: NoSchedule key: node-role.kubernetes.io/master - key: node.kubernetes.io/not-ready + - effect: NoSchedule + key: node-role.kubernetes.io/control-plane