config: include --cri-timeout in containerd health-checker defaults#1307
Conversation
kubernetes-prow
Bot
added
cncf-cla: yes
|
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 Regular contributors should join the org to skip this step. Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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
Bot
added
the
size/S
| @@ -1,4 +1,4 @@ | |||
| { | |||
| { | |||
There was a problem hiding this comment.
The first line of config/health-checker-containerd.json now starts with \xEF\xBB\xBF, which Go's encoding/json rejects, so NPD fails to load the config with invalid character 'ï'. It likely came from your editor saving as "UTF-8 with BOM". You can strip it with:
perl -i -pe 's/^\x{FEFF}//' config/health-checker-containerd.json| } | ||
| } | ||
|
|
||
| func TestCriTimeoutFlagParsing(t *testing.T) { |
There was a problem hiding this comment.
Please drop changes to this file, it does not add much value.
|
/ok-to-test |
kubernetes-prow
Bot
added
ok-to-test
|
@hakman Thanks for the review — glad the containerd-only scope looks right. I'll push an update that:
|
8d77404 to
97d58d2
Compare
kubernetes-prow
Bot
added
size/XS
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. Add --cri-timeout=10s to the sample Linux and Windows containerd configs. Signed-off-by: dpacgdm <dpac.gdm@gmail.com>
|
Update pushed: BOM stripped, |
|
/retest |
1 similar comment
|
/retest |
|
/override pull-npd-e2e-kubernetes-gce-gci |
|
@hakman: Overrode contexts on behalf of hakman: pull-npd-e2e-kubernetes-gce-gci DetailsIn response to this:
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
Bot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dpacgdm, hakman The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
kubernetes-prow
Bot
added
the
approved
2 participants
Summary
--cri-timeoutis already supported by the health-checker binary and is correctly passed through custom plugin ruleargs. The default containerd health-checker configs omitted the flag, socrictlfell back to the 2s built-in default.This change:
--cri-timeout=10sto the Linux and Windows containerd sample configs--cri-timeoutparses correctlyRelated issue
Fixes #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=2sobservation matches the default when the flag is absent from the config they deployed.Test plan
go test ./cmd/healthchecker/options -count=1