8000 Make container and image removal/stop idempotent by saschagrunert · Pull Request #8431 · cri-o/cri-o · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Make container and image removal/stop idempotent #8431

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
Jul 30, 2024
Merged

Make container and image removal/stop idempotent #8431

merged 1 commit into from
Jul 30, 2024

Conversation

saschagrunert
Copy link
Member
@saschagrunert saschagrunert commented Jul 30, 2024 •
edited
Loading

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Fully conform to the CRI as well as the new tests from kubernetes-sigs/cri-tools#1536

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Made `StopContainer`, `RemoveContainer` and `RemoveImage` idempotent per CRI API definition:
https://github.com/kubernetes/cri-api/blob/c20fa40/pkg/apis/runtime/v1/api.proto

@saschagrunert saschagrunert requested a review from mrunalp as a code owner July 30, 2024 09:41
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 8000 kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jul 30, 2024
@openshift-ci openshift-ci bot requested review from klihub and sohankunkerkar July 30, 2024 09:41
@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2024
@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 changed the title WIP: Make container and image removal/stop idempotent Make container and image removal/stop idempotent Jul 30, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 30, 2024
@saschagrunert saschagrunert mentioned this pull request Jul 30, 2024
Merged
@codecov Codecov
Copy link
codecov bot commented Jul 30, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 73.68421% with 5 lines in your changes missing coverage. Please review.

Project coverage is 49.42%. Comparing base (a1874e1) to head (b98f569).
Report is 3 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #8431      +/-   ##
==========================================
+ Coverage   49.41%   49.42%   +0.01%     
==========================================
  Files         153      153              
  Lines       17142    17156      +14     
==========================================
+ Hits         8470     8480      +10     
- Misses       7604     7607       +3     
- Partials     1068     1069       +1

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-crun-e2e

@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/ci-cgroupv2-e2e-crun, ci/prow/ci-crun-e2e

In response to this:

/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-crun-e2e

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-sigs/prow repository.

@saschagrunert
Make container and image removal/stop idempotent
b98f569 
Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@saschagrunert
Copy link
Member Author

/test e2e-gcp-ovn

1 similar comment
@saschagrunert
Copy link
Member Author

/test e2e-gcp-ovn

@saschagrunert
Copy link
Member Author

/override ci/prow/e2e-gcp-ovn

@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/prow/e2e-gcp-ovn

In response to this:

/override ci/prow/e2e-gcp-ovn

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-sigs/prow repository.

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

@cri-o/cri-o-maintainers PTAL
/retest

@haircommander
Copy link
Member

/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-e2e-crun

@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

@haircommander: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • ci/prow/ci-e2e-crun

Only the following failed contexts/checkruns were expected:

  • ci/kata-jenkins
  • ci/prow/ci-cgroupv2-e2e
  • ci/prow/ci-cgroupv2-e2e-crun
  • ci/prow/ci-cgroupv2-e2e-features
  • ci/prow/ci-cgroupv2-integration
  • ci/prow/ci-crun-e2e
  • ci/prow/ci-e2e
  • ci/prow/ci-e2e-conmonrs
  • ci/prow/ci-e2e-evented-pleg
  • ci/prow/ci-fedora-critest
  • ci/prow/ci-fedora-integration
  • ci/prow/ci-fedora-kata
  • ci/prow/ci-images
  • ci/prow/ci-rhel-critest
  • ci/prow/ci-rhel-e2e
  • ci/prow/e2e-aws-ovn
  • ci/prow/e2e-gcp-ovn
  • ci/prow/images
  • ci/prow/periodics-images
  • create-release
  • dco
  • pull-ci-cri-o-cri-o-main-ci-cgroupv2-e2e
  • pull-ci-cri-o-cri-o-main-ci-cgroupv2-e2e-crun
  • pull-ci-cri-o-cri-o-main-ci-cgroupv2-e2e-features
  • pull-ci-cri-o-cri-o-main-ci-cgroupv2-integration
  • pull-ci-cri-o-cri-o-main-ci-crun-e2e
  • pull-ci-cri-o-cri-o-main-ci-e2e
  • pull-ci-cri-o-cri-o-main-ci-e2e-conmonrs
  • pull-ci-cri-o-cri-o-main-ci-e2e-evented-pleg
  • pull-ci-cri-o-cri-o-main-ci-fedora-critest
  • pull-ci-cri-o-cri-o-main-ci-fedora-integration
  • pull-ci-cri-o-cri-o-main-ci-fedora-kata
  • pull-ci-cri-o-cri-o-main-ci-images
  • pull-ci-cri-o-cri-o-main-ci-rhel-critest
  • pull-ci-cri-o-cri-o-main-ci-rhel-e2e
  • pull-ci-cri-o-cri-o-main-e2e-aws-ovn
  • pull-ci-cri-o-cri-o-main-e2e-gcp-ovn
  • pull-ci-cri-o-cri-o-main-images
  • pull-ci-cri-o-cri-o-main-periodics-images
  • release-notes
  • rpm-build:fedora-rawhide-aarch64:fedora-rawhide
  • rpm-build:fedora-rawhide-x86_64:fedora-rawhide
  • static-build-upload
  • tide
  • upload-artifacts

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-e2e-crun

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-sigs/prow repository.

@haircommander
Copy link
Member

/override ci/prow/ci-cgroupv2-integration
/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-crun-e2e

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 30, 2024
@openshift-ci OpenShift CI
Copy link
Contributor
openshift-ci bot commented Jul 30, 2024

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/ci-cgroupv2-e2e-crun, ci/prow/ci-cgroupv2-integration, ci/prow/ci-crun-e2e

In response to this:

/override ci/prow/ci-cgroupv2-integration
/override ci/prow/ci-cgroupv2-e2e-crun
/override ci/prow/ci-crun-e2e

/lgtm

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-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 96019ab into cri-o:main Jul 30, 2024
71 of 73 checks passed
@saschagrunert saschagrunert deleted the idempotence branch July 31, 2024 07:02
@sohankunkerkar sohankunkerkar mentioned this pull request Aug 19, 2024
Closed
@sohankunkerkar
Copy link
Member

/cherry-pick release-1.30

@sohankunkerkar
Copy link
Member

/cherry-pick release-1.29

@openshift-cherrypick-robot
Copy link

@sohankunkerkar: #8431 failed to apply on top of branch "release-1.30":

Applying: Make container and image removal/stop idempotent
Using index info to reconstruct a base tree...
M	server/container_remove.go
M	server/container_remove_test.go
M	server/container_stop.go
M	server/container_stop_test.go
M	server/image_remove.go
M	server/image_remove_test.go
M	test/restore.bats
Falling back to patching base and 3-way merge...
Auto-merging test/restore.bats
Auto-merging server/image_remove_test.go
CONFLICT (content): Merge conflict in server/image_remove_test.go
Auto-merging server/image_remove.go
CONFLICT (content): Merge conflict in server/image_remove.go
Auto-merging server/container_stop_test.go
Auto-merging server/container_stop.go
CONFLICT (content): Merge conflict in server/container_stop.go
Auto-merging server/container_remove_test.go
Auto-merging server/container_remove.go
CONFLICT (content): Merge conflict in server/container_remove.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Make container and image removal/stop idempotent
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.30

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-sigs/prow repository.

@openshift-cherrypick-robot
Copy link

@sohankunkerkar: #8431 failed to apply on top of branch "release-1.29":

Applying: Make container and image removal/stop idempotent
Using index info to reconstruct a base tree...
M	server/container_remove.go
M	server/container_remove_test.go
M	server/container_stop.go
M	server/container_stop_test.go
M	server/image_remove.go
M	server/image_remove_test.go
M	test/restore.bats
Falling back to patching base and 3-way merge...
Auto-merging test/restore.bats
Auto-merging server/image_remove_test.go
CONFLICT (content): Merge conflict in server/image_remove_test.go
Auto-merging server/image_remove.go
CONFLICT (content): Merge conflict in server/image_remove.go
Auto-merging server/container_stop_test.go
CONFLICT (content): Merge conflict in server/container_stop_test.go
Auto-merging server/container_stop.go
CONFLICT (content): Merge conflict in server/container_stop.go
Auto-merging server/container_remove_test.go
Auto-merging server/container_remove.go
CONFLICT (content): Merge conflict in server/container_remove.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Make container and image removal/stop idempotent
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.29

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-sigs/prow repository.

This was referenced Aug 19, 2024
Merged
Merged
@haircommander haircommander mentioned this pull request Sep 5, 2024
Merged
@github-actions github-actions bot mentioned this pull request Sep 25, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@klihub klihub Awaiting requested review from klihub

@sohankunkerkar sohankunkerkar Awaiting requested review from sohankunkerkar

Assignees

@haircommander haircommander

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@saschagrunert @haircommander @sohankunkerkar @openshift-cherrypick-robot
0