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

Automated cherry pick of #45349 #45401

Merged
merged 1 commit into from
May 9, 2017
Merged

Automated cherry pick of #45349 #45401

merged 1 commit into from
May 9, 2017

Conversation

gmarek
Copy link
Contributor

@gmarek gmarek commented May 5, 2017 •
edited

Cherry pick of #45349 on release-1.6.

#45349: Make Daemons tolerate NoExecute taints correctly

Fix a bug that caused invalid Tolerations to be applied to Pods created by DaemonSets.

@k8s-reviewable
Copy link

This change is Reviewable

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

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels May 5, 2017
@gmarek gmarek force-pushed the automated-cherry-pick-of-#45349-upstream-release-1.6 branch from 960fdbb to 96b4889 Compare May 5, 2017 08:54
@gmarek gmarek mentioned this pull request May 5, 2017
Closed
@k8s-github-robot k8s-github-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels May 5, 2017
@gmarek gmarek added this to the v1.6 milestone May 5, 2017
@gmarek gmarek modified the milestones: v1.6.1, v1.6 May 5, 2017
@gmarek gmarek assigned ethernetdan, enisoc and wojtek-t and unassigned lukaszo and jayunit100 May 5, 2017
@wojtek-t
Copy link
Member

wojtek-t commented May 5, 2017

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 5, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 5, 2017
@gmarek gmarek force-pushed the automated-cherry-pick-of-#45349-upstream-release-1.6 branch from 96b4889 to fabed75 Compare May 5, 2017 11:08
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 5, 2017
@gmarek gmarek force-pushed the automated-cherry-pick-of-#45349-upstream-release-1.6 branch from fabed75 to 9ac920b Compare May 5, 2017 13:26
@gmarek
Copy link
Contributor Author

gmarek commented May 8, 2017

Fixed bazel.

@enisoc @ethernetdan - please review, as this is a bug fix that should go in next patch release.

@wojtek-t
Copy link
Member

wojtek-t commented May 8, 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 8, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gmarek, wojtek-t

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

@timothysc
Copy link
Member

/cc @kubernetes/sig-cluster-lifecycle-bugs

@k8s-ci-robot k8s-ci-robot added the sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. label May 8, 2017
@enisoc enisoc added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels May 8, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 10f0f17 into kubernetes:release-1.6 May 9, 2017
@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
No reviews
Assignees

@ethernetdan ethernetdan

@enisoc enisoc

@wojtek-t wojtek-t

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. 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/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.

None yet