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.

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

Replace node-role.kubernetes.io/master with control-plane label and add control-plane toleration #2017

Merged
merged 2 commits into from
May 4, 2022

Conversation

xmudrii
Copy link
Member

@xmudrii xmudrii commented May 4, 2022

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

  • Replace node-role.kubernetes.io/master label selector with node-role.kubernetes.io/control-plane
    • Nodes running Kubernetes 1.24 are no longer having the node-role.kubernetes.io/master label
    • Nodes running Kubernetes 1.20 and newer have the node-role.kubernetes.io/control-plane label, and since KubeOne 1.4 only supports Kubernetes 1.20 and newer, it's safe to do this migration
  • Add node-role.kubernetes.io/control-plane toleration in addition to node-role.kubernetes.io/master toleration
    • The node-role.kubernetes.io/master toleration will be removed with Kubernetes 1.25

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
xref #2010

Does this PR introduce a user-facing change?:

[ACTION REQUIRED] Kubeadm is now applying the `node-role.kubernetes.io/control-plane` label for Kubernetes 1.24 nodes. The old label (`node-role.kubernetes.io/master`) will be removed when upgrading the cluster to Kubernetes 1.24. All addons are updated to use the `node-role.kubernetes.io/control-plane` label selector instead. All addons now have toleration for `node-role.kubernetes.io/control-plane` taint in addition to toleration for `node-role.kubernetes.io/master` taint. If you are overriding addons, make sure to apply those changes before upgrading to Kubernetes 1.24.

/assign @kron4eg

…dons

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
@xmudrii xmudrii requested a review from kron4eg May 4, 2022 08:05
@kubermatic-bot kubermatic-bot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 4, 2022
@kron4eg
Copy link
Member

kron4eg commented May 4, 2022

/approve
/lgtm

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label May 4, 2022
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: f9d6d9717ebfffa69b7fbaa0833fda808b5aa957

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kron4eg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 4, 2022
@xmudrii
Copy link
Member Author

xmudrii commented May 4, 2022

/test pull-kubeone-e2e-aws-conformance-1.23

@kubermatic-bot kubermatic-bot merged commit d29ac55 into master May 4, 2022
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.5 milestone May 4, 2022
@kubermatic-bot kubermatic-bot deleted the control-plane-label branch May 4, 2022 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note-action-required Denotes a PR that introduces potentially breaking changes that require user action. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants