Skip to content

Automated cherry pick of #127162: Avoid SidecarContainers code path for non-sidecar pods #127202

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
Merged
merged 1 commit into from
Sep 9, 2024
Merged

Automated cherry pick of #127162: Avoid SidecarContainers code path for non-sidecar pods #127202

merged 1 commit into from
Sep 9, 2024

Conversation

@SergeyKanzhelev
Copy link
Member

Cherry pick of #127162 on release-1.31.

#127162: Avoid SidecarContainers code path for non-sidecar pods

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

Fixed a regression in 1.29+ default configurations, where regular init containers may fail to start due to a temporary container runtime failure.

@gjkim42 @SergeyKanzhelev
Avoid SidecarContainers code path for non-sidecar pods
8469207 
This fixes a regression in the SidecarContainers feature by minimizing
the impact of the new code path. Use the old code path for pods without
restartable init containers, and apply the new code path only to pods
with restartable init containers.
@k8s-ci-robot k8s-ci-robot added this to the v1.31 milestone Sep 6, 2024
@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. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. 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. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 6, 2024
@SergeyKanzhelev
Copy link
Member Author

/kind regression
/priority critical-urgent
/triage accepted

@k8s-ci-robot k8s-ci-robot added kind/regression Categorizes issue or PR as related to a regression from a prior release. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed do-not-merge/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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 6, 2024
@liggitt
Copy link
Member

liggitt commented Sep 6, 2024

/lgtm
/approve
/cc @kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team September 6, 2024 18:20
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 6, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 78da2e7d7480c28a4ac76c75aab11e5912bd2ca9

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 6, 2024
@liggitt liggitt removed the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Sep 6, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Sep 6, 2024
@liggitt
Copy link
Member

liggitt commented Sep 6, 2024

(left the regression tag just on the 1.29 backport, since the 1.28 → 1.29 transition was where the regression happened)

@liggitt liggitt added the kind/bug Categorizes issue or PR as related to a bug. label Sep 6, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Sep 6, 2024
@jeremyrickard jeremyrickard 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 Sep 9, 2024
@k8s-ci-robot k8s-ci-robot merged commit 8cf2eb9 into kubernetes:release-1.31 Sep 9, 2024
@SergeyKanzhelev SergeyKanzhelev deleted the automated-cherry-pick-of-#127162-upstream-release-1.31 branch September 14, 2024 07:25
This was referenced Sep 25, 2024
Open
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ffromani ffromani Awaiting requested review from ffromani

@mtaufen mtaufen Awaiting requested review from mtaufen

Assignees

@liggitt liggitt

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/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. 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

SIG Node: code and documentation PRs
Archived in project
[sig-release] Bug Triage
Archived in project

Milestone

v1.31

Development

Successfully merging this pull request may close these issues.

5 participants

@SergeyKanzhelev @liggitt @k8s-ci-robot @jeremyrickard @gjkim42