Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(support-bundle): revert master node taint tolerations #1309

Merged
merged 1 commit into from
Apr 14, 2023
Merged

fix(support-bundle): revert master node taint tolerations #1309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions manager/integration/tests/common.py
View file
Open in desktop
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