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.

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

crictl allow setting grace period for stop containers upon reset #10651

Merged
merged 2 commits into from
Jan 22, 2024
Merged

Conversation

krembu
Copy link
Contributor

@krembu krembu commented Nov 26, 2023

What type of PR is this?
/kind feature

What this PR does / why we need it:
Kubespray upon cluster reset has default 0 second or no grace period for stopping containers. we would like to allow containers to gracefully terminate themselves given a cri_stop_containers_grace_period.

# crictl stop container grace period
cri_stop_containers_grace_period: 0

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:
allow kubespray user to set grace period for stop containers upon cluster reset
keep same default to 0 as was before this change

crictl allow setting grace period for stop containers upon reset (using `cri_stop_containers_grace_period`)

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 26, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @krembu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 26, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 26, 2023
@yankay
Copy link
Member

yankay commented Nov 27, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 27, 2023
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 27, 2023
@krembu krembu changed the title crictl allow setting grace period for stop containers and pods crictl allow setting grace period for stop containers upon reset Nov 27, 2023
@krembu
Copy link
Contributor Author

krembu commented Nov 27, 2023

sorry for bumping another patch. the parameter was wrongly place. corrected.

@krembu
Copy link
Contributor Author

krembu commented Nov 27, 2023

# crictl --help | grep timeout
   --timeout value, -t value           Timeout of connecting to the server in seconds (e.g. 2s, 20s.). 0 or less is set to default (default: 2s)

# crictl stop --help
NAME:
   crictl stop - Stop one or more running containers

USAGE:
   crictl stop [command options] CONTAINER-ID [CONTAINER-ID...]

OPTIONS:
   --timeout value, -t value  **Seconds to wait to kill the container after a graceful stop is requested (default: 0)**
   --help, -h                 show help

@VannTen
Copy link
Contributor

VannTen commented Nov 27, 2023

The same option name between the main and sub command is confusing for sure 😮‍💨

@krembu
Copy link
Contributor Author

krembu commented Dec 11, 2023

can we merge?

@yankay
Copy link
Member

yankay commented Dec 11, 2023

Thanks @krembu
The code is OK.
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2023
@floryut floryut added kind/container-managers Containers section in the release note and removed kind/feature Categorizes issue or PR as related to a new feature. labels Jan 22, 2024
Copy link
Member

@floryut floryut left a comment

Choose a reason for hiding this comment

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

@krembu Thank you for the PR 👍

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, krembu

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 22, 2024
@k8s-ci-robot k8s-ci-robot merged commit 3e7b568 into kubernetes-sigs:master Jan 22, 2024
63 checks passed
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
…ernetes-sigs#10651)

* crictl allow setting different grace period for stop containers and pods

* correct grace period location
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/container-managers Containers section in the release note lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants