Skip to content

Commit

Permalink
Remove deprecated taint
Browse files Browse the repository at this point in the history
This taint should match the new role name "control-plane"

Kubeadm [will remove this with 1.25][issue]

[issue]: kubernetes/kubeadm#2200
  • Loading branch information
PurpleBooth committed Aug 1, 2022
1 parent 2388412 commit 59a5cbf
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ locals {
allow_scheduling_on_control_plane = local.is_single_node_cluster ? true : var.allow_scheduling_on_control_plane

# Default k3s node taints
default_control_plane_taints = concat([], local.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/master:NoSchedule"])
default_control_plane_taints = concat([], local.allow_scheduling_on_control_plane ? [] : ["node-role.kubernetes.io/control-plane:NoSchedule"])

packages_to_install = concat(var.enable_longhorn ? ["open-iscsi", "nfs-client"] : [], var.extra_packages_to_install)

Expand Down
6 changes: 3 additions & 3 deletions templates/plans.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
matchExpressions:
- {key: k3s_upgrade, operator: Exists}
- {key: k3s_upgrade, operator: NotIn, values: ["disabled", "false"]}
- {key: node-role.kubernetes.io/master, operator: NotIn, values: ["true"]}
- {key: node-role.kubernetes.io/control-plane, operator: NotIn, values: ["true"]}
tolerations:
- {key: server-usage, effect: NoSchedule, operator: Equal, value: storage}
prepare:
Expand Down Expand Up @@ -43,9 +43,9 @@ spec:
matchExpressions:
- {key: k3s_upgrade, operator: Exists}
- {key: k3s_upgrade, operator: NotIn, values: ["disabled", "false"]}
- {key: node-role.kubernetes.io/master, operator: In, values: ["true"]}
- {key: node-role.kubernetes.io/control-plane, operator: In, values: ["true"]}
tolerations:
- {key: node-role.kubernetes.io/master, effect: NoSchedule, operator: Exists}
- {key: node-role.kubernetes.io/control-plane, effect: NoSchedule, operator: Exists}
- {key: CriticalAddonsOnly, effect: NoExecute, operator: Exists}
cordon: true
upgrade:
Expand Down

0 comments on commit 59a5cbf

Please sign in to comment.