allow setting crictl timeout

Author: karlhungus

cmd/healthchecker/options/options.go

@@ -39,6 +39,7 @@ type HealthCheckerOptions struct {
 	EnableRepair       bool
 	CriCtlPath         string
 	CriSocketPath      string
+	CriTimeout         time.Duration
 	CoolDownTime       time.Duration
 	LoopBackTime       time.Duration
 	HealthCheckTimeout time.Duration
@@ -62,6 +63,8 @@ func (hco *HealthCheckerOptions) AddFlags(fs *pflag.FlagSet) {
 		"The path to the crictl binary. This is used to check health of cri component.")
 	fs.StringVar(&hco.CriSocketPath, "cri-socket-path", types.DefaultCriSocketPath,
 		"The path to the cri socket. Used with crictl to specify the socket path.")
+	fs.DurationVar(&hco.CriTimeout, "cri-timeout", types.DefaultCriTimeout,
+		"The duration to wait for crictl to run.")
 	fs.DurationVar(&hco.CoolDownTime, "cooldown-time", types.DefaultCoolDownTime,
 		"The duration to wait for the service to be up before attempting repair.")
 	fs.DurationVar(&hco.LoopBackTime, "loopback-time", types.DefaultLoopBackTime,

pkg/healthchecker/health_checker.go

@@ -150,7 +150,7 @@ func getHealthCheckFunc(hco *options.HealthCheckerOptions) func() (bool, error)
 		}
 	case types.CRIComponent:
 		return func() (bool, error) {
-			if _, err := execCommand(hco.HealthCheckTimeout, hco.CriCtlPath, "--runtime-endpoint="+hco.CriSocketPath, "pods", "--latest"); err != nil {
+			if _, err := execCommand(hco.HealthCheckTimeout, hco.CriCtlPath, "--timeout="+hco.CriTimeout.String()+"--runtime-endpoint="+hco.CriSocketPath, "pods", "--latest"); err != nil {
 				return false, nil
 			}
 			return true, nil

pkg/healthchecker/types/types_linux.go

@@ -19,5 +19,6 @@ package types
 const (
 	DefaultCriCtl        = "/usr/bin/crictl"
 	DefaultCriSocketPath = "unix:///var/run/containerd/containerd.sock"
+	DefaultCriTimeout    = "2s"
 	UptimeTimeLayout     = "Mon 2006-01-02 15:04:05 MST"
 )

pkg/healthchecker/types/types_windows.go

@@ -19,6 +19,7 @@ package types
 const (
 	DefaultCriCtl        = "C:/etc/kubernetes/node/bin/crictl.exe"
 	DefaultCriSocketPath = "npipe:////./pipe/containerd-containerd"
+	DefaultCriTimeout    = "2s"
 	UptimeTimeLayout     = "Mon 02 Jan 2006 15:04:05 MST"
 	LogParsingTimeFormat = "yyyy-MM-dd HH:mm:ss"
 )