add default values to healthConfig

Signed-off-by: Arjun Raja Yogidas <[email protected]>

Author: coderbirju

pkg/cmd/container/create.go

@@ -892,6 +892,11 @@ func withHealthcheck(options types.ContainerCreateOptions, ensuredImage *imgutil
 		hc.StartPeriod = options.HealthStartPeriod
 	}
 
+	// Apply defaults for any unset values, but only if we have a healthcheck configured
+	if len(hc.Test) > 0 && hc.Test[0] != "NONE" {
+		hc.ApplyDefaults()
+	}
+
 	// If no healthcheck config is set (via CLI or image), return empty string so we skip adding to container config.
 	if reflect.DeepEqual(hc, &healthcheck.Healthcheck{}) {
 		return "", nil

pkg/healthcheck/health.go

@@ -136,3 +136,19 @@ func HealthcheckResultFromJSON(s string) (*HealthcheckResult, error) {
 	}
 	return &r, nil
 }
+
+// ApplyDefaults sets default values for unset healthcheck fields
+func (hc *Healthcheck) ApplyDefaults() {
+	if hc.Interval == 0 {
+		hc.Interval = DefaultProbeInterval
+	}
+	if hc.Timeout == 0 {
+		hc.Timeout = DefaultProbeTimeout
+	}
+	if hc.StartPeriod == 0 {
+		hc.StartPeriod = DefaultStartPeriod
+	}
+	if hc.Retries == 0 {
+		hc.Retries = DefaultProbeRetries
+	}
+}

pkg/healthcheck/healthcheck_manager_linux.go

@@ -265,7 +265,7 @@ func shouldSkipHealthCheckSystemd(hc *Healthcheck, cfg *config.Config) bool {
 	}
 
 	// Don't proceed if health check is nil, empty, explicitly NONE or interval is 0.
-	if hc == nil || len(hc.Test) == 0 || hc.Test[0] == "NONE" || hc.Interval == 0 {
+	if hc == nil || len(hc.Test) == 0 || hc.Test[0] == "NONE" {
 		return true
 	}
 	return false