Skip to content

Add pod prune for api v2#5733

Merged
openshift-merge-robot merged 1 commit into
containers:masterfrom
sujil02:v2-pod-prune
Apr 18, 2020
Merged

Add pod prune for api v2#5733
openshift-merge-robot merged 1 commit into
containers:masterfrom
sujil02:v2-pod-prune

Conversation

@sujil02
Copy link
Copy Markdown
Member

@sujil02 sujil02 commented Apr 6, 2020

Add pod prune for api v2.

Add the ability to prune pods for api v2,
Includes the addition of force flag, for client-side prompt.

Signed-off-by: Sujil02 sushah@redhat.com

Copy link
Copy Markdown
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

Tested locally and looking good. Nice job, @sujil02. Just minor nits.

Comment thread pkg/api/server/register_pods.go Outdated
Comment thread pkg/api/server/register_pods.go Outdated
Comment thread pkg/bindings/pods/pods.go Outdated
Comment thread cmd/podmanV2/pods/prune.go Outdated
Comment thread pkg/api/handlers/libpod/pods.go Outdated
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This does not match the usage of Force for pruning containers or volumes, we should drop this. Force is client-side-only and removes the yes/no continue prompt.

Copy link
Copy Markdown
Member Author

@sujil02 sujil02 Apr 6, 2020

Choose a reason for hiding this comment

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

@baude @jwhonce I thought we agreed to add the force for prune pod.
Should I go ahead and change this to the client-side only?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fixed the force flag. @mheon PTAL

@rh-atomic-bot
Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #5507) made this pull request unmergeable. Please resolve the merge conflicts.

@sujil02 sujil02 force-pushed the v2-pod-prune branch 8 times, most recently from d209314 to f095073 Compare April 8, 2020 01:15
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 8, 2020

/approve

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan, sujil02

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 8, 2020
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 8, 2020

LGTM
@vrothberg @mheon @TomSweeneyRedHat PTAL

Copy link
Copy Markdown
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

I consider the change to v1 a breaking change. It's inconsistent with other prune commands but it's still breaking previous behavior.

I am okay doing that for v2 but want an explicit ok from @mheon and @baude for the v1 client.

Comment thread cmd/podmanV2/pods/prune.go Outdated
@rh-atomic-bot
Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #5842) made this pull request unmergeable. Please resolve the merge conflicts.

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2020
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 17, 2020

@sujil02 Needs a rebase.

@sujil02
Copy link
Copy Markdown
Member Author

sujil02 commented Apr 17, 2020

@sujil02 Needs a rebase.

Yeah on it. It Needs some test fixes as well with the rebase.

@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 17, 2020
Add the ability to prune pods for api v2,
Includes the addition of force flag, for client side prompt.
Update test suite to support this use case.

Signed-off-by: Sujil02 <sushah@redhat.com>
@sujil02
Copy link
Copy Markdown
Member Author

sujil02 commented Apr 17, 2020

Done. Changed the commit messages as CLI force flag edits are no longer required.

@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 18, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 18, 2020
@openshift-merge-robot openshift-merge-robot merged commit e4e42b2 into containers:master Apr 18, 2020
@github-actions github-actions Bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 25, 2023
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Sep 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants