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 #116554: API-initiated eviction: handle deleteOptions correctly #116750

Merged
merged 1 commit into from
Mar 30, 2023
Merged

Automated cherry pick of #116554: API-initiated eviction: handle deleteOptions correctly #116750

merged 1 commit into from
Mar 30, 2023
+285 −10

Conversation

atiratree
Copy link
Member

@atiratree atiratree commented Mar 20, 2023 •
edited by liggitt

Cherry pick of #116554 on release-1.26.

#116554: API-initiated eviction: handle deleteOptions correctly

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

Fixed 1.26 regressions introduced by the PodDisruptionConditions feature (on by default in 1.26):
* pod eviction API calls returned spurious precondition errors and required a second evict API call to succeed
* dry-run eviction API calls persisted a DisruptionTarget condition into the pod being evicted

@atiratree
API-initiated eviction: handle deleteOptions correctly
0272959 
when adding a DisruptionTarget condition into a pod that will be deleted

- handle ResourceVersion and Preconditions correctly
- handle DryRun option correctly

Co-authored-by: Jordan Liggitt jordan@liggitt.net
@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Mar 20, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.26 milestone Mar 20, 2023
@k8s-ci-robot k8s-ci-robot added 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. labels Mar 20, 2023
@k8s-ci-robot k8s-ci-robot added area/test sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 20, 2023
@atiratree atiratree mentioned this pull request Mar 20, 2023
Merged
@atiratree
Copy link
Member Author

/assign @liggitt

@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 Mar 20, 2023
@atiratree
Copy link
Member Author

eviction integration tests passing since the master PR merged 3 days ago

@atiratree
Copy link
Member Author

/kind bug
/kind regression
/sig api-machinery
/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added 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. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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 do-not-merge/needs-kind Indicates a PR lacks a `kind/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. labels Mar 20, 2023
@alculquicondor
Copy link
Member

/retest

@liggitt
Copy link
Member

liggitt commented Mar 20, 2023

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

@k8s-ci-robot k8s-ci-robot requested a review from a team March 20, 2023 12:25
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 20, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 158c947d6c1a86f0fec887d773f9f0c9c804d36e

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

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 Mar 20, 2023
@alculquicondor
Copy link
Member

/retest

@liggitt
Copy link
Member

liggitt commented Mar 20, 2023

W0320 12:43:01.804] 2023/03/20 12:43:01 main.go:328: Something went wrong: failed to acquire k8s binaries: U=file:///go/src/k8s.io/kubernetes/_output/gcs-stage R=v1.26.3-3+df96302de9bd79 get-kube.sh failed: error during /workspace/get-kube.sh: exit status 1

might be kubernetes/release#2972

@liggitt
Copy link
Member

liggitt commented Mar 21, 2023

waiting on #116808 to fix CI

@liggitt
Copy link
Member

liggitt commented Mar 21, 2023

/retest

1 similar comment
@liggitt
Copy link
Member

liggitt commented Mar 21, 2023

/retest

@cici37
Copy link
Contributor

cici37 commented Mar 30, 2023

/label cherry-pick-approved

@k8s-ci-robot
Copy link
Contributor

@cici37: The label(s) /label cherry-pick-approved cannot be applied. These labels are supported: api-review, tide/merge-method-merge, tide/merge-method-rebase, tide/merge-method-squash, team/katacoda, refactor, official-cve-feed. Is this label configured under labels -> additional_labels or labels -> restricted_labels in plugin.yaml?

In response to this:

/label cherry-pick-approved

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.

@cici37 cici37 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 Mar 30, 2023
@k8s-ci-robot k8s-ci-robot merged commit 863386a into kubernetes:release-1.26 Mar 30, 2023
@liggitt liggitt added the kind/feature Categorizes issue or PR as related to a new feature. label Sep 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aojea aojea Awaiting requested review from aojea

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

Assignees

@liggitt liggitt

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. kind/feature Categorizes issue or PR as related to a new feature. 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. 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/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. 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
None yet
Milestone
v1.26
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@atiratree @alculquicondor @liggitt @k8s-ci-robot @cici37