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

Adjust DisruptionTarget condition message to do not include preemptor pod metadata #114914

Merged
merged 1 commit into from
Jan 9, 2023
Merged

Adjust DisruptionTarget condition message to do not include preemptor pod metadata #114914

merged 1 commit into from
Jan 9, 2023
+1 −1

Conversation

mimowo
Copy link
Contributor

@mimowo mimowo commented Jan 9, 2023 •
edited by liggitt
Loading

What type of PR is this?

/kind bug
/kind regression

What this PR does / why we need it:

Which issue(s) this PR fixes:

Part of #114882 (in condition)

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix a regression in default 1.26 configurations with the PodDisruptionConditions feature enabled where preemptor pod metadata can be included in the message of DisruptionTarget condition

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/regression Categorizes issue or PR as related to a regression from a prior release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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 Jan 9, 2023
@k8s-ci-robot
Copy link
Contributor

@mimowo: 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 Jan 9, 2023
@mimowo mimowo mentioned this pull request Jan 9, 2023
Closed
@k8s-ci-robot k8s-ci-robot added the sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. label Jan 9, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Jan 9, 2023

/assign @Huang-Wei

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Jan 9, 2023
chendave
chendave reviewed Jan 9, 2023
View reviewed changes
Copy link
Member

@chendave chendave left a comment

Choose a reason for hiding this comment

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

/lgtm

pkg/scheduler/framework/preemption/preemption.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 9, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 82359027eb66235b0bc7f3b9106820a9df3e1a2c

@mimowo mimowo force-pushed the do-not-leak-pod-name branch from bff0359 to ad47f59 Compare January 9, 2023 09:06
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 9, 2023
@mimowo
Copy link
Contributor Author

mimowo commented Jan 9, 2023

/retest

@mimowo mimowo force-pushed the do-not-leak-pod-name branch from 2ad801a to bdf58ce Compare January 9, 2023 11:22
@alculquicondor
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, mimowo

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 Jan 9, 2023
@Huang-Wei
Copy link
Member

/lgtm

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

LGTM label has been added.

Git tree hash: 1930bf61fe8d829a3a40decad40f1d96ad6790ee

@k8s-ci-robot k8s-ci-robot merged commit eb7fd7f into kubernetes:master Jan 9, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.27 milestone Jan 9, 2023
@mimowo mimowo mentioned this pull request Jan 10, 2023
Merged
k8s-ci-robot added a commit that referenced this pull request Jan 12, 2023
@k8s-ci-robot
Merge pull request #114945 from mimowo/automated-cherry-pick-of-#1149…
5d3c413 
…14-upstream-release-1.26

Automated cherry pick of #114914: Adjust DisruptionTarget condition message to do not include
@alculquicondor alculquicondor mentioned this pull request Jan 26, 2023
Closed
12 tasks
@mimowo mimowo deleted the do-not-leak-pod-name branch March 18, 2023 18:32
@hLanceNuro
Copy link

Drive by comment: Is there any way to opt into this behavior? It is useful for us to determine which pod was the preemptor for a given preempted pod.

@alculquicondor
Copy link
Member

we changed the event to include pod UID https://github.com/mimowo/kubernetes/blob/f0415a65b41e5eecc04425992c612832b27915f9/pkg/scheduler/framework/preemption/preemption.go#L388

We can do the same for the condition. Feel free to send a PR.

@hLanceNuro
Copy link

we changed the event to include pod UID https://github.com/mimowo/kubernetes/blob/f0415a65b41e5eecc04425992c612832b27915f9/pkg/scheduler/framework/preemption/preemption.go#L388

We can do the same for the condition. Feel free to send a PR.

Oh that's exactly what we need. Our version of k8s is still logging Preempted by a pod on node so we must be on a version cut between this PR and #119971.

Thanks for the quick reply 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@denkensk denkensk denkensk left review comments

@sanposhiho sanposhiho Awaiting requested review from sanposhiho

@chendave chendave Awaiting requested review from chendave

@Huang-Wei Huang-Wei Awaiting requested review from Huang-Wei

Assignees

@Huang-Wei Huang-Wei

@chendave chendave

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. 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/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.27
Development

Successfully merging this pull request may close these issues.
7 participants
@mimowo @k8s-ci-robot @alculquicondor @Huang-Wei @hLanceNuro @chendave @denkensk