Browse Source

Merge pull request #35533 from AliyunContainerService/supress-warning-healthcheck-none

Suppress warning when NONE was set for healthcheck
Yong Tang 7 years ago
parent
commit
29d6aef393
1 changed files with 2 additions and 0 deletions
  1. 2 0
      daemon/health.go

+ 2 - 0
daemon/health.go

@@ -254,6 +254,8 @@ func getProbe(c *container.Container) probe {
 		return &cmdProbe{shell: false}
 	case "CMD-SHELL":
 		return &cmdProbe{shell: true}
+	case "NONE":
+		return nil
 	default:
 		logrus.Warnf("Unknown healthcheck type '%s' (expected 'CMD') in container %s", config.Test[0], c.ID)
 		return nil