Skip to content

config: include --cri-timeout in containerd health-checker defaults#1307

Open
dpacgdm wants to merge 1 commit into
kubernetes:masterfrom
dpacgdm:fix/cri-timeout-default-config
Open

config: include --cri-timeout in containerd health-checker defaults#1307
dpacgdm wants to merge 1 commit into
kubernetes:masterfrom
dpacgdm:fix/cri-timeout-default-config

Conversation

@dpacgdm

@dpacgdm dpacgdm commented Jul 9, 2026

Copy link
Copy Markdown

Summary

--cri-timeout is already supported by the health-checker binary and is correctly passed through custom plugin rule args. The default containerd health-checker configs omitted the flag, so crictl fell back to the 2s built-in default.

This change:

  • Adds --cri-timeout=10s to the Linux and Windows containerd sample configs
  • Adds a unit test that --cri-timeout parses correctly

Related issue

#1248

Note: when the flag is present in rule args, NPD already propagates it (util.Exec(ctx, rule.Path, rule.Args...)). The reporter's --timeout=2s observation matches the default when the flag is absent from the config they deployed.

Test plan

  • go test ./cmd/healthchecker/options -count=1

The health-checker binary honors --cri-timeout when passed via custom
plugin rule args. The default containerd configs omitted the flag, so
crictl used the 2s built-in default. Document the flag in the sample
configs and add a unit test that --cri-timeout parses correctly.

Signed-off-by: dpacgdm <dpac.gdm@gmail.com>
@kubernetes-prow kubernetes-prow Bot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 9, 2026
@kubernetes-prow

Copy link
Copy Markdown
Contributor

Hi @dpacgdm. Thanks for your PR.

I'm waiting for a kubernetes 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.

Details

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.

@kubernetes-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dpacgdm
Once this PR has been reviewed and has the lgtm label, please assign dchen1107 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@kubernetes-prow kubernetes-prow Bot requested review from sjenning and wangzhen127 July 9, 2026 09:00
@kubernetes-prow kubernetes-prow Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 9, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant