kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-02 00:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

API defaults use structs default

Browse Source
This commit is contained in:
Alex Dadgar
2017-05-10 13:51:52 -07:00
parent 77978ae907
commit 715c6bcc4a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/jobs.go
View File

@@ -332,24 +332,26 @@ func (u *UpdateStrategy) Canonicalize() {
u.MaxParallel = helper.IntToPtr(0)
}
d := structs.DefaultUpdateStrategy
if u.HealthCheck == nil {
u.HealthCheck = helper.StringToPtr(structs.UpdateStrategyHealthCheck_Checks)
u.HealthCheck = helper.StringToPtr(d.HealthCheck)
}
if u.HealthyDeadline == nil {
u.HealthyDeadline = helper.TimeToPtr(5 * time.Minute)
u.HealthyDeadline = helper.TimeToPtr(d.HealthyDeadline)
}
if u.MinHealthyTime == nil {
u.MinHealthyTime = helper.TimeToPtr(10 * time.Second)
u.MinHealthyTime = helper.TimeToPtr(d.MinHealthyTime)
}
if u.AutoRevert == nil {
u.AutoRevert = helper.BoolToPtr(false)
u.AutoRevert = helper.BoolToPtr(d.AutoRevert)
}
if u.Canary == nil {
u.Canary = helper.IntToPtr(0)
u.Canary = helper.IntToPtr(d.Canary)
}
}

2
nomad/structs/structs.go
View File

@@ -1667,7 +1667,7 @@ const (
var (
// DefaultUpdateStrategy provides a baseline that can be used to upgrade
// jobs with the old policy
// jobs with the old policy or for populating field defaults.
DefaultUpdateStrategy = &UpdateStrategy{
MaxParallel: 0,
HealthCheck: UpdateStrategyHealthCheck_Checks,