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 #121147: Fix panic if there are more terminating pods than active pods #122267

Merged
merged 1 commit into from
Dec 14, 2023
Merged

Automated cherry pick of #121147: Fix panic if there are more terminating pods than active pods #122267

merged 1 commit into from
Dec 14, 2023

Conversation

kannon92
Copy link
Contributor

@kannon92 kannon92 commented Dec 11, 2023 •
edited

Cherry pick of #121147 on release-1.28.

#121147: Fix panic if there are more terminating pods than active pods

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

Fix panic if there are more terminating pods than active pods

I had to modify this PR to resolve some conflicts due to ptr versus pointer. I changed a unit test to use pointer rather than ptr which has minimal impact.

This resolves #122235 in case of PodFailurePolicy is set (with PodReplacementPolicy disabled).

/cc @mimowo @alculquicondor @soltysh

@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Dec 11, 2023
@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/S Denotes a PR that changes 10-29 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. labels Dec 11, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Dec 11, 2023
@k8s-ci-robot k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Dec 11, 2023
@kannon92 kannon92 force-pushed the automated-cherry-pick-of-#121147-upstream-release-1.28 branch from b3737fd to 2af031b Compare December 11, 2023 14:26
@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 Dec 11, 2023
@mimowo
Copy link
Contributor

mimowo commented Dec 11, 2023

/lgtm
Ideally, I would also like to have the #122261 on this cherry-pick, but the cherry-pick deadline is Decemeber 15, so not sure it can make it.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 6a7c66f5261727fde72dfb2272459f00528a253d

@mimowo mimowo mentioned this pull request Dec 11, 2023
Merged
@mimowo
Copy link
Contributor

mimowo commented Dec 11, 2023

/assign @soltysh

@mimowo
Copy link
Contributor

mimowo commented Dec 11, 2023

/test pull-kubernetes-unit-go-compatibility

@kannon92
Copy link
Contributor Author

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Dec 11, 2023
@alculquicondor
Copy link
Member

/approve
/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team December 11, 2023 16:22
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 11, 2023
@k8s-ci-robot k8s-ci-robot 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 Dec 14, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, kannon92, 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 k8s-ci-robot merged commit a5495b7 into kubernetes:release-1.28 Dec 14, 2023
14 checks passed
This was referenced Dec 14, 2023
Merged
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@mortent mortent Awaiting requested review from mortent

@soltysh soltysh Awaiting requested review from soltysh

Assignees

@soltysh soltysh

@mimowo mimowo

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. 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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
SIG Apps
Archived in project
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@kannon92 @k8s-ci-robot @mimowo @alculquicondor @saschagrunert @soltysh