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 #113481: kubelet: fix pod log line corruption when using timestamps #113515

Merged
merged 1 commit into from
Nov 2, 2022
Merged

Automated cherry pick of #113481: kubelet: fix pod log line corruption when using timestamps #113515

merged 1 commit into from
Nov 2, 2022

Conversation

rphillips
Copy link
Member

@rphillips rphillips commented Nov 1, 2022 •
edited
Loading

Cherry pick of #113481 on release-1.25.

#113481: kubelet: fix pod log line corruption when using timestamps

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

Pod logs using --timestamps are not broken up with timestamps anymore.

@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone Nov 1, 2022
@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 1, 2022
@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 1, 2022
This was referenced Nov 1, 2022
Merged
Merged
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Nov 1, 2022
@rphillips
Copy link
Member Author

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Nov 1, 2022
@mrunalp
Copy link
Contributor

mrunalp commented Nov 2, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 2, 2022
@matthyx
Copy link
Contributor

matthyx commented Nov 2, 2022

/cc kubernetes/release-managers
/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot requested a review from a team November 2, 2022 10:29
@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 2, 2022
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Nov 2, 2022
@saschagrunert
Copy link
Member

Do we have to CP this one to other release branches as well?

@rphillips
Copy link
Member Author

@saschagrunert I have two more backports

#113516
#113517

@rphillips
Copy link
Member Author

@saschagrunert cherry picks are approved and lgtm'ed.

@saschagrunert saschagrunert 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/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 2, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mrunalp, rphillips, saschagrunert

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 added a commit that referenced this pull request Nov 2, 2022
@k8s-ci-robot
Merge pull request #113517 from rphillips/automated-cherry-pick-of-#1…
91a0ad4 
…13515-upstream-release-1.23

Automated cherry pick of #113515: kubelet: fix pod log line corruption when using timestamps
@k8s-ci-robot k8s-ci-robot merged commit eb92f1b into kubernetes:release-1.25 Nov 2, 2022
k8s-ci-robot added a commit that referenced this pull request Nov 2, 2022
@k8s-ci-robot
Merge pull request #113516 from rphillips/automated-cherry-pick-of-#1…
bef7b2f 
…13515-upstream-release-1.24

Automated cherry pick of #113515: kubelet: fix pod log line corruption when using timestamps
@TheRealHaoLiu TheRealHaoLiu mentioned this pull request Dec 14, 2022
Merged
@TheRealHaoLiu TheRealHaoLiu mentioned this pull request Jan 4, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp mrunalp approved these changes

@saschagrunert saschagrunert saschagrunert approved these changes

@andrewsykim andrewsykim Awaiting requested review from andrewsykim

@matthyx matthyx Awaiting requested review from matthyx

Assignees

@mrunalp mrunalp

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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.
5 participants
@rphillips @mrunalp @matthyx @saschagrunert @k8s-ci-robot