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 #93333: Fix an issue when rotated logs of dead containers are not #94470

Merged
merged 2 commits into from Sep 12, 2020
Merged

Automated cherry pick of #93333: Fix an issue when rotated logs of dead containers are not #94470

merged 2 commits into from Sep 12, 2020

Conversation

loburm
Copy link
Contributor

@loburm loburm commented Sep 3, 2020

Cherry pick of #93333 #94185 on release-1.17.

#93333: Fix an issue when rotated logs of dead containers are not
#94185: test(kuberuntime): deflake TestRemoveContainer

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Sep 3, 2020
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 3, 2020
@k8s-ci-robot k8s-ci-robot added area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 3, 2020
@loburm
Copy link
Contributor Author

loburm commented Sep 3, 2020

/assign @dchen1107

@knight42 @loburm
test(kuberuntime): deflake TestRemoveContainer
3ab95fa 
Signed-off-by: knight42 <anonymousknight96@gmail.com>
@loburm loburm force-pushed the automated-cherry-pick-of-#93333-#94185-upstream-release-1.17 branch from ace2454 to 3ab95fa Compare September 3, 2020 14:12
@tpepper
Copy link
Member

tpepper commented Sep 4, 2020

/kind bug
/kind flake
/priority important-soon
from parent PR(s).

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. kind/flake Categorizes issue or PR as related to a flaky test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 4, 2020
@tpepper
Copy link
Member

tpepper commented Sep 4, 2020

/retest

@dchen1107
Copy link
Member

/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 Sep 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Sep 8, 2020
@SergeyKanzhelev
Copy link
Member

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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 Sep 9, 2020
@SergeyKanzhelev SergeyKanzhelev mentioned this pull request Sep 9, 2020
Merged
@tpepper
Copy link
Member

tpepper commented Sep 11, 2020 •
edited

@dchen1107 we have your approval on #94470 for 1.17, but it would be confusing for consumers to have the fix in 1.17 and 1.19 but not 1.18. Can you check that #94468 one too should be having lgtm/approve?

@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 11, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Sep 11, 2020
@tpepper tpepper removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 12, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Sep 12, 2020
@tpepper tpepper added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 12, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Sep 12, 2020
@spiffxp
Copy link
Member

spiffxp commented Sep 12, 2020 •
edited

/test pull-kubernetes-node-e2e
going to see if this triggers a fresh run (ref: kubernetes/k8s.io#1120 (comment))

@k8s-ci-robot k8s-ci-robot merged commit a410643 into kubernetes:release-1.17 Sep 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dims dims Awaiting requested review from dims

@Random-Liu Random-Liu Awaiting requested review from Random-Liu

Assignees

@dchen1107 dchen1107

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet 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. kind/flake Categorizes issue or PR as related to a flaky test. 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-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.17
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@loburm @tpepper @dchen1107 @k8s-ci-robot @SergeyKanzhelev @spiffxp @knight42