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

kubeadm: only taint CP nodes when the legacy "master" taint is present #109840

Merged
merged 1 commit into from May 6, 2022
Merged

kubeadm: only taint CP nodes when the legacy "master" taint is present #109840

merged 1 commit into from May 6, 2022

Conversation

neolit123
Copy link
Member

What type of PR is this?

/kind bug

What this PR does / why we need it:

During upgrade when a CP node is missing the old / legacy "master"
taint, assume the user has manually removed it to allow
workloads to schedule.

In such cases do not re-taint the node with the new "control-plane"
taint.

Which issue(s) this PR fixes:

xref kubernetes/kubeadm#2200 (comment)

Special notes for your reviewer:

Does this PR introduce a user-facing change?

kubeadm: only taint control plane nodes when the legacy "master" taint is present. This avoids a bug where "kubeadm upgrade" will re-taint a control plane node with the new "control plane" taint even if the user explicitly untainted the node.

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@neolit123
kubeadm: only taint CP nodes when the legacy "master" taint is present
b1f3034 
During upgrade when a CP node is missing the old / legacy "master"
taint, assume the user has manually removed it to allow
workloads to schedule.

In such cases do not re-taint the node with the new "control-plane"
taint.
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels May 5, 2022
@neolit123
Copy link
Member Author

/triage accepted
/kind bug
/priority important-soon

/cc @pacoxu @SataQiu
PTAL for review.

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. area/kubeadm sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 5, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: neolit123

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2022
This was referenced May 5, 2022
Merged
Closed
@neolit123
Copy link
Member Author

/retest

pacoxu
pacoxu reviewed May 6, 2022
View reviewed changes
Copy link
Member

@pacoxu pacoxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

As this is only needed for upgrades from 1.23 to 1.24, this can be removed in v1.25 or later.
However, this logic has no side effects, so we can keep it.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 6, 2022
@k8s-ci-robot k8s-ci-robot merged commit 7141b6d into kubernetes:master May 6, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 6, 2022
@neolit123
Copy link
Member Author

As this is only needed for upgrades from 1.23 to 1.24, this can be removed in v1.25 or later.
However, this logic has no side effects, so we can keep it.

Yep we can change the code later in 1.25 following the KEP plan.

k8s-ci-robot added a commit that referenced this pull request May 9, 2022
@k8s-ci-robot
Merge pull request #109841 from neolit123/automated-cherry-pick-of-#1…
f92dd7a 
…09840-origin-release-1.24

Automated cherry pick of #109840: kubeadm: only taint CP nodes when the legacy "master" taint
@github-actions github-actions bot mentioned this pull request May 11, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pacoxu pacoxu pacoxu left review comments

@SataQiu SataQiu Awaiting requested review from SataQiu

Assignees

@pacoxu pacoxu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubeadm cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@neolit123 @k8s-ci-robot @pacoxu