luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #1864 from hashicorp/b-allow-empty-resource

Browse source 
Allow omitting resource block entirely
This commit is contained in:
Michael Schurter 2016-10-26 13:26:04 -07:00 committed by GitHub
parent 2d6a873dfb 41c5bdb510
commit 8e3d9d4f4f
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@ BUG FIXES:
the client [GH-1641] the client [GH-1641]
* discovery/jobspec: Validate service name after interpolation [GH-1852] * discovery/jobspec: Validate service name after interpolation [GH-1852]
* driver/docker: Fix `local/` directory mount into container [GH-1830] * driver/docker: Fix `local/` directory mount into container [GH-1830]
* jobspec: Tasks without a resource block no longer fail to validate [GH-1864]
## 0.4.1 (August 18, 2016) ## 0.4.1 (August 18, 2016)

9
nomad/structs/structs.go
View file

@ -2106,7 +2106,10 @@ func (t *Task) Canonicalize(job *Job, tg *TaskGroup) {
service.Canonicalize(job.Name, tg.Name, t.Name) service.Canonicalize(job.Name, tg.Name, t.Name)
} }
if t.Resources != nil { // If Resources are nil initialize them to defaults, otherwise canonicalize
if t.Resources == nil {
t.Resources = DefaultResources()
} else {
t.Resources.Canonicalize() t.Resources.Canonicalize()
} }
@ -2158,12 +2161,12 @@ func (t *Task) Validate(ephemeralDisk *EphemeralDisk) error {
// Validate the resources. // Validate the resources.
if t.Resources == nil { if t.Resources == nil {
mErr.Errors = append(mErr.Errors, errors.New("Missing task resources")) mErr.Errors = append(mErr.Errors, errors.New("Missing task resources"))
} else if err := t.Resources.MeetsMinResources(); err != nil { } else {
if err := t.Resources.MeetsMinResources(); err != nil {
mErr.Errors = append(mErr.Errors, err) mErr.Errors = append(mErr.Errors, err)
} }
// Ensure the task isn't asking for disk resources // Ensure the task isn't asking for disk resources
if t.Resources != nil {
if t.Resources.DiskMB > 0 { if t.Resources.DiskMB > 0 {
mErr.Errors = append(mErr.Errors, errors.New("Task can't ask for disk resources, they have to be specified at the task group level.")) mErr.Errors = append(mErr.Errors, errors.New("Task can't ask for disk resources, they have to be specified at the task group level."))
} }