Skip to content

Commit

Permalink
fix(support-bundle): revert master node taint tolerations
Browse files Browse the repository at this point in the history
Fix this upstream instead.

Ref: 5614

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
  • Loading branch information
c3y1huang committed Apr 13, 2023
1 parent 713257b commit 3beb6bc
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions manager/integration/tests/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)


Expand Down

0 comments on commit 3beb6bc

Please sign in to comment.