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 #121103: Use Patch instead of SSA for Pod Disruption condition #121379

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Automated cherry pick of #121103: Use Patch instead of SSA for Pod Disruption condition #121379

merged 1 commit into from
Oct 23, 2023

Conversation

mimowo
Copy link
Contributor

@mimowo mimowo commented Oct 20, 2023 •
edited

Cherry pick of #121103 on release-1.28.

#121103: Use Patch instead of SSA for Pod Disruption condition

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

Fixed a regression in default configurations, which enabled PodDisruptionConditions by default, 
that prevented the control plane's pod garbage collector from deleting pods that contained duplicated field keys (env. variables with repeated keys or container ports).

@k8s-ci-robot k8s-ci-robot added this to the v1.28 milestone Oct 20, 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/L Denotes a PR that changes 100-499 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/test labels Oct 20, 2023
@k8s-ci-robot k8s-ci-robot added the sig/apps Categorizes an issue or PR as relevant to SIG Apps. label Oct 20, 2023
@k8s-ci-robot k8s-ci-robot added sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 20, 2023
@mimowo mimowo force-pushed the automated-cherry-pick-of-#121103-upstream-release-1.28 branch from 0e239d8 to 9505250 Compare October 20, 2023 06:54
@mimowo mimowo force-pushed the automated-cherry-pick-of-#121103-upstream-release-1.28 branch from 9505250 to 951a96d Compare October 20, 2023 07:01
@mimowo
Copy link
Contributor Author

mimowo commented Oct 20, 2023

/retest
The failures look unrelated

@bart0sh bart0sh added this to Triage in SIG Node PR Triage Oct 20, 2023
@mimowo mimowo mentioned this pull request Oct 20, 2023
Merged
@mimowo
Copy link
Contributor Author

mimowo commented Oct 20, 2023

/assign @liggitt
FYI @alculquicondor @atiratree @dims

@bart0sh
Copy link
Contributor

bart0sh commented Oct 20, 2023

/triage accepted
/priority important-soon
/kind bug
/lgtm

@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. kind/bug Categorizes issue or PR as related to a bug. labels Oct 20, 2023
@k8s-ci-robot k8s-ci-robot removed 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. labels Oct 20, 2023
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Oct 20, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 839005b37dd0a96d3fde7b67256311cac036e1b8

@bart0sh bart0sh moved this from Triage to Needs Approver in SIG Node PR Triage Oct 20, 2023
@dims
Copy link
Member

dims commented Oct 20, 2023

/kind bug
/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 20, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Oct 20, 2023

/cc kubernetes/release-managers

@k8s-ci-robot k8s-ci-robot requested a review from a team October 20, 2023 12:19
@liggitt
Copy link
Member

liggitt commented Oct 20, 2023

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

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dims, liggitt, mimowo, 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

@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 Oct 23, 2023
@k8s-ci-robot k8s-ci-robot merged commit 9cb0244 into kubernetes:release-1.28 Oct 23, 2023
15 checks passed
SIG Node PR Triage automation moved this from Needs Approver to Done Oct 23, 2023
@korjek
Copy link

korjek commented Nov 2, 2023

could you please clarify if this was released already? And if yes, in which patch version

@liggitt
Copy link
Member

liggitt commented Nov 2, 2023

not yet, will be in 1.28.4 / 1.27.8 / 1.26.11

@mimowo mimowo deleted the automated-cherry-pick-of-#121103-upstream-release-1.28 branch November 29, 2023 15:00
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

@chendave chendave Awaiting requested review from chendave

@kow3ns kow3ns Awaiting requested review from kow3ns

Assignees

@dims dims

@liggitt liggitt

@bart0sh bart0sh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test 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/apps Categorizes an issue or PR as relevant to SIG Apps. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Apps
Archived in project
SIG Auth
Archived in project
SIG Node PR Triage
Archived in project
SIG Node PR Triage
Done
Milestone
v1.28
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@mimowo @bart0sh @k8s-ci-robot @dims @liggitt @korjek @saschagrunert