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 #87933 upstream release 1.17 1582743755 #88586

Merged
merged 3 commits into from Mar 17, 2020
Merged

Automated cherry pick of #87933 upstream release 1.17 1582743755 #88586

merged 3 commits into from Mar 17, 2020

Conversation

jdef
Copy link
Contributor

@jdef jdef commented Feb 26, 2020 •
edited

Cherry-pick of #87933 on release-1.17

#87933: Fix docker/journald logging conformance

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

/kind bug

Fix failing conformance when using docker container runtime w/ the docker/journald logging driver. #87933

@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 Feb 26, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.17 milestone Feb 26, 2020
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. 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-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 Feb 26, 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 Feb 26, 2020
@jdef
Copy link
Contributor Author

jdef commented Feb 26, 2020

/assign @yujuhong

@k8s-ci-robot k8s-ci-robot added 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 Feb 26, 2020
@jdef
Copy link
Contributor Author

jdef commented Feb 26, 2020

/retest

mattjmcnaughton
mattjmcnaughton approved these changes Feb 27, 2020
View reviewed changes
Copy link
Contributor

@mattjmcnaughton mattjmcnaughton left a comment

Choose a reason for hiding this comment

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

/lgtm

To ensure I'm understanding, with this change, the 1.17 branch will now pass the conformance tests which were previously failing? That seems like a worthy reason for a cherry-pick, especially given the isolated scope of this change.

Out of curiosity, should we also cherry-pick to 1.16 and 1.15? Tbh... I'm not positive about the actual instances in which folks would be running the specific conformance tests you saw breaking.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 27, 2020
@jdef
Copy link
Contributor Author

jdef commented Feb 27, 2020

/lgtm

To ensure I'm understanding, with this change, the 1.17 branch will now pass the conformance tests which were previously failing? That seems like a worthy reason for a cherry-pick, especially given the isolated scope of this change.

Out of curiosity, should we also cherry-pick to 1.16 and 1.15? Tbh... I'm not positive about the actual instances in which folks would be running the specific conformance tests you saw breaking.

Yes, this change allows conformance tests to pass w/ legacy docker runtime, as described above.
I haven't tested this patch against 1.15 yet, but the problem probably exists there too.

@mattjmcnaughton
Copy link
Contributor

mattjmcnaughton commented Feb 28, 2020 via email

@jdef
Copy link
Contributor Author

jdef commented Mar 2, 2020

@yujuhong PTAL

@jdef
Copy link
Contributor Author

jdef commented Mar 6, 2020

@tallclair PTAL; would like to land this for the next 1.17.x release

@derekwaynecarr
Copy link
Member

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, jdef

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 Mar 17, 2020
@jdef
Copy link
Contributor Author

jdef commented Mar 17, 2020

@kubernetes/patch-release-team PTAL this has been approved

@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 Mar 17, 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 Mar 17, 2020
@k8s-ci-robot k8s-ci-robot merged commit 71ae70f into kubernetes:release-1.17 Mar 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattjmcnaughton mattjmcnaughton mattjmcnaughton approved these changes

@tallclair tallclair Awaiting requested review from tallclair

@vishh vishh Awaiting requested review from vishh

Assignees

@mattjmcnaughton mattjmcnaughton

@derekwaynecarr derekwaynecarr

@yujuhong yujuhong

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. 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/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
6 participants
@jdef @mattjmcnaughton @derekwaynecarr @k8s-ci-robot @tpepper @yujuhong