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: Fix the tainting of the master node #45376

Merged
merged 1 commit into from
May 4, 2017
Merged

kubeadm: Fix the tainting of the master node #45376

merged 1 commit into from
May 4, 2017

Conversation

luxas
Copy link
Member

@luxas luxas commented May 4, 2017

What this PR does / why we need it:

Currently, kubeadm unintentionally removes Taints set with the kubelet flag --register-with-taints when creating a new Taint slice instead of appening the existing one. This PR fixes that behavior.

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

Special notes for your reviewer:

This should be a cherrypick candidate for v1.6 cc @enisoc

Release note:

kubeadm: Fix invalid assign statement so it is possible to register the master kubelet with other initial Taints

@jbeda @dmmcquay @mikedanese @krousey PTAL, very straightforward PR

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 4, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 4, 2017
@luxas luxas added cherrypick-candidate and removed approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 4, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 4, 2017
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@dmmcquay
Copy link
Contributor

dmmcquay commented May 4, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 4, 2017
@luxas luxas mentioned this pull request May 4, 2017
Closed
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dmmcquay, luxas

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 45309, 45376)

@k8s-github-robot k8s-github-robot merged commit 5a9759b into kubernetes:master May 4, 2017
@mikedanese
Copy link
Member

/lgtm

@luxas luxas added this to the v1.6 milestone May 6, 2017
@luxas luxas mentioned this pull request May 6, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request May 9, 2017
Merge pull request #45450 from luxas/automated-cherry-pick-of-#45376-…
9d68760 
…upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #45376

Cherry pick of #45376 on release-1.6.

#45376: kubeadm: Fix the tainting of the master node
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dmmcquay dmmcquay dmmcquay approved these changes

Assignees

@dmmcquay dmmcquay

@mikedanese mikedanese

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
9 participants
@luxas @k8s-reviewable @k8s-cherrypick-bot @dmmcquay @k8s-github-robot @mikedanese @errordeveloper @lukemarsden @k8s-ci-robot