Merge pull request #660 from grosser/grosser/latest

k8s-ci-robot · web-flow · commit 9a9b06d24d8a · 2022-07-26T20:00:28.000-07:00
simplify cri health check
diff --git a/pkg/healthchecker/health_checker.go b/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, "--image-endpoint="+hco.CriSocketPath, "pods"); err != nil {
+			if _, err := execCommand(hco.HealthCheckTimeout, hco.CriCtlPath, "--runtime-endpoint="+hco.CriSocketPath, "pods", "--latest"); err != nil {
 				return false, nil
 			}
 			return true, nil

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ func getHealthCheckFunc(hco *options.HealthCheckerOptions) func() (bool, error)`
`150`	`150`	`}`
`151`	`151`	`case types.CRIComponent:`
`152`	`152`	`return func() (bool, error) {`
`153`		`- if _, err := execCommand(hco.HealthCheckTimeout, hco.CriCtlPath, "--runtime-endpoint="+hco.CriSocketPath, "--image-endpoint="+hco.CriSocketPath, "pods"); err != nil {`
	`153`	`+ if _, err := execCommand(hco.HealthCheckTimeout, hco.CriCtlPath, "--runtime-endpoint="+hco.CriSocketPath, "pods", "--latest"); err != nil {`
`154`	`154`	`return false, nil`
`155`	`155`	`}`
`156`	`156`	`return true, nil`