Merge branch 'refactor/health-check' into 'master'

只要声明ports，就免费赠送tcp健康检查，如需http健康检查，需自定义url以及expected_codes，相应地agent也需要修改

agent 配套改动见
http://gitlab.ricebook.net/platform/agent/merge_requests/12

@platform

See merge request !34

Author: timfeirg

VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

cluster/calcium/create_container.go

@@ -3,6 +3,7 @@ package calcium
 import (
 	"fmt"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -594,10 +595,15 @@ func (c *calcium) makeContainerOptions(quota map[string]int, specs types.Specs,
 		"version": utils.GetVersion(opts.Image),
 		"ports":   strings.Join(ports, ","),
 	}
-	// 支持健康检测, 但是只支持tcp和http
-	if entry.HealthCheck == "tcp" || entry.HealthCheck == "http" {
-		containerLabels["healthcheck"] = entry.HealthCheck
+	// 只要声明了ports，就免费赠送tcp健康检查，如果需要http健康检查，还要单独声明 healthcheck_url
+	if entry.HealthCheckUrl != "" {
+		containerLabels["healthcheck"] = "http"
+		containerLabels["healthcheck_url"] = entry.HealthCheckUrl
+		containerLabels["healthcheck_expected_code"] = strconv.Itoa(entry.HealthCheckExpectedCode)
+	} else {
+		containerLabels["healthcheck"] = "tcp"
 	}
+
 	// 要把after_start和before_stop写进去
 	containerLabels[AFTER_START] = entry.AfterStart
 	containerLabels[BEFORE_STOP] = entry.BeforeStop

devtools/upgrade-eru-core.sh

@@ -13,7 +13,7 @@ then
 elif [ $deploy_mode == "prod" ]
 then
   ssh c2-eru-1.ricebook.link -t 'sudo yum --enablerepo=ricebook clean metadata'
-  ssh c1-eru-1.ricebook.link -t 'sudo yum makecache'
+  ssh c2-eru-1.ricebook.link -t 'sudo yum makecache'
   ssh c2-eru-1.ricebook.link -t 'sudo yum reinstall -y eru-core'
   ssh c2-eru-1.ricebook.link -t 'sudo systemctl daemon-reload'
   ssh c2-eru-1.ricebook.link -t 'sudo systemctl restart eru-core.service'

types/config.go

@@ -1,25 +1,28 @@
 package types
 
+// Config holds eru-core config
 type Config struct {
 	Bind           string   `yaml:"bind"`             // HTTP API address
 	AgentPort      string   `yaml:"agent_port"`       // Agent HTTP port, may not be used
 	PermDir        string   `yaml:"permdir"`          // Permanent dir on host
 	EtcdMachines   []string `yaml:"etcd"`             // etcd cluster addresses
 	EtcdLockPrefix string   `yaml:"etcd_lock_prefix"` // etcd lock prefix, all locks will be created under this dir
-	ResourceAlloc  string   `yaml:"resource_alloc`    // scheduler or cpu-period TODO give it a good name
+	ResourceAlloc  string   `yaml:"resource_alloc"`   // scheduler or cpu-period TODO give it a good name
 
 	Git       GitConfig    `yaml:"git"`
 	Docker    DockerConfig `yaml:"docker"`
 	Scheduler SchedConfig  `yaml:"scheduler"`
 	Syslog    SyslogConfig `yaml:"syslog"`
 }
 
+// GitConfig holds eru-core git config
 type GitConfig struct {
 	PublicKey   string `yaml:"public_key"`   // public key to clone code
 	PrivateKey  string `yaml:"private_key"`  // private key to clone code
 	GitlabToken string `yaml:"gitlab_token"` // GitLab token to call GitLab API
 }
 
+// DockerConfig holds eru-core docker config
 type DockerConfig struct {
 	APIVersion  string `yaml:"version"`      // docker API version
 	LogDriver   string `yaml:"log_driver"`   // docker log driver, can be "json-file", "none"
@@ -31,13 +34,14 @@ type DockerConfig struct {
 	UseLocalDNS bool   `yaml:"local_dns"`    // use node IP as dns
 }
 
+// SchedConfig holds scheduler config
 type SchedConfig struct {
 	LockKey string `yaml:"lock_key"` // key for etcd lock
 	LockTTL int    `yaml:"lock_ttl"` // TTL for etcd lock
 	Type    string `yaml:"type"`     // choose simple or complex scheduler
 }
 
-// 用于debug模式容器的日志收集
+// SyslogConfig 用于debug模式容器的日志收集
 type SyslogConfig struct {
 	Address  string `yaml:"address"`
 	Facility string `yaml:"facility"`

types/specs.go

@@ -22,19 +22,20 @@ type Specs struct {
 
 // single entrypoint
 type Entrypoint struct {
-	Command       string   `yaml:"cmd,omitempty"`
-	AfterStart    string   `yaml:"after_start,omitempty"`
-	BeforeStop    string   `yaml:"before_stop,omitempty"`
-	Ports         []Port   `yaml:"ports,omitempty,flow"`
-	Exposes       []Expose `yaml:"exposes,omitempty,flow"`
-	NetworkMode   string   `yaml:"network_mode,omitempty"`
-	RestartPolicy string   `yaml:"restart,omitempty"`
-	HealthCheck   string   `yaml:"health_check,omitempty"`
-	ExtraHosts    []string `yaml:"hosts,omitempty,flow"`
-	PermDir       bool     `yaml:"permdir,omitempty"`
-	Privileged    string   `yaml:"privileged,omitempty"`
-	LogConfig     string   `yaml:"log_config,omitempty"`
-	WorkingDir    string   `yaml:"working_dir,omitempty"`
+	Command                 string   `yaml:"cmd,omitempty"`
+	AfterStart              string   `yaml:"after_start,omitempty"`
+	BeforeStop              string   `yaml:"before_stop,omitempty"`
+	Ports                   []Port   `yaml:"ports,omitempty,flow"`
+	Exposes                 []Expose `yaml:"exposes,omitempty,flow"`
+	NetworkMode             string   `yaml:"network_mode,omitempty"`
+	RestartPolicy           string   `yaml:"restart,omitempty"`
+	HealthCheckUrl          string   `yaml:"healthcheck_url,omitempty"`
+	HealthCheckExpectedCode int      `yaml:"healthcheck_expected_code,omitempty"`
+	ExtraHosts              []string `yaml:"hosts,omitempty,flow"`
+	PermDir                 bool     `yaml:"permdir,omitempty"`
+	Privileged              string   `yaml:"privileged,omitempty"`
+	LogConfig               string   `yaml:"log_config,omitempty"`
+	WorkingDir              string   `yaml:"working_dir,omitempty"`
 }
 
 // single bind