From 5c30f2ee9f4def9924c852970ccfbf11a0083d6d Mon Sep 17 00:00:00 2001 From: Chin-Ya Huang Date: Thu, 13 Apr 2023 14:48:53 +0800 Subject: [PATCH] fix(support-bundle): revert master node taint tolerations Fix this upstream instead. Ref: 5614 Signed-off-by: Chin-Ya Huang --- manager/integration/tests/common.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/manager/integration/tests/common.py b/manager/integration/tests/common.py index c9f39e9dec..162063bd13 100644 --- a/manager/integration/tests/common.py +++ b/manager/integration/tests/common.py @@ -207,8 +207,6 @@ KUBERNETES_STATUS_LABEL = "KubernetesStatus" -MASTER_NODE_TAINT = "node-role.kubernetes.io/master=true:NoExecute;node-role.kubernetes.io/master=true:NoSchedule" # NOQA - # https://github.com/kubernetes/kubernetes/blob/a9f0db16614ae62563ead2018f1692407bd93d8f/pkg/apis/scheduling/types.go#L29 # NOQA PRIORITY_CLASS_MAX = 1000000000 PRIORITY_CLASS_MIN = 1 @@ -3168,9 +3166,6 @@ def reset_settings(client): for setting in client.list_setting(): setting_name = setting.name setting_default_value = setting.definition.default - if setting_name == "taint-toleration": - setting_default_value = MASTER_NODE_TAINT - setting_readonly = setting.definition.readOnly # We don't provide the setup for the storage network, hence there is no @@ -4874,9 +4869,6 @@ def get_engine_image_status_value(client, ei_name): def update_setting(client, name, value): setting = client.by_id_setting(name) - if name == "taint-toleration": - value = value + ";" + MASTER_NODE_TAINT - client.update(setting, value=value)