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

Do not remove kubelet labels during startup #54073

Merged
merged 1 commit into from
Oct 17, 2017
Merged

Do not remove kubelet labels during startup #54073

merged 1 commit into from
Oct 17, 2017

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Oct 17, 2017 •
edited
Loading

Fixes #54070

kubelet: prevent removal of default labels from Node API objects on startup

@liggitt
Copy link
Member Author

liggitt commented Oct 17, 2017

cc @kubernetes/sig-node-pr-reviews @kubernetes/sig-node-bugs @mrIncompetent

@liggitt liggitt added this to the v1.8 milestone Oct 17, 2017
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 17, 2017
@mrIncompetent
Copy link
Contributor

lgtm, sorry for missing the bare-metal case :(

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. kind/bug Categorizes issue or PR as related to a bug. labels Oct 17, 2017
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 17, 2017
@liggitt liggitt mentioned this pull request Oct 17, 2017
Merged
@jhorwit2
Copy link
Contributor

@mrIncompetent this also impacts the external cloud controller manager although that's less widely adopted at this point in time.

lgtm

@dims
Copy link
Member

dims commented Oct 17, 2017

LGTM 👍

@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 17, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, liggitt

Associated issue: 54070

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

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 k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2017
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit abb7789 into kubernetes:master Oct 17, 2017
@jpbetz jpbetz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 17, 2017
k8s-github-robot pushed a commit that referenced this pull request Oct 21, 2017
Merge pull request #54074 from liggitt/automated-cherry-pick-of-#5407…
4f5f672 
…3-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #54073

Cherry pick of #54073 on release-1.8.

#54073: Do not remove kubelet labels during startup
@liggitt liggitt deleted the node-default-label branch October 23, 2017 04:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gyliu513 gyliu513

@derekwaynecarr derekwaynecarr

@dchen1107 dchen1107

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.