a/agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: make runtime type pod the default

Browse Source 
In this way users are not forced to always set it in the config file.
This commit is contained in:
Simone Gotti 2019-05-23 23:23:54 +02:00
parent c0a165de31
commit 7658c44694
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/config/config.go
View File

@ -685,8 +685,10 @@ func checkConfig(config *Config) error {
} }
r := task.Runtime r := task.Runtime
if r.Type != RuntimeTypePod { if r.Type != "" {
return errors.Errorf("task %q runtime: wrong type %q", task.Name, r.Type) if r.Type != RuntimeTypePod {
return errors.Errorf("task %q runtime: wrong type %q", task.Name, r.Type)
}
} }
if len(r.Containers) == 0 { if len(r.Containers) == 0 {
return errors.Errorf("task %q runtime: at least one container must be defined", task.Name) return errors.Errorf("task %q runtime: at least one container must be defined", task.Name)
@ -801,6 +803,12 @@ func checkConfig(config *Config) error {
task.WorkingDir = defaultWorkingDir task.WorkingDir = defaultWorkingDir
} }
// set task runtime type to pod if empty
r := task.Runtime
if r.Type == "" {
r.Type = RuntimeTypePod
}
// set steps defaults // set steps defaults
for i, s := range task.Steps { for i, s := range task.Steps {
switch step := s.(type) { switch step := s.(type) {

1
internal/runconfig/runconfig.go
View File

@ -22,6 +22,7 @@ import (
rstypes "github.com/sorintlab/agola/internal/services/runservice/types" rstypes "github.com/sorintlab/agola/internal/services/runservice/types"
"github.com/sorintlab/agola/internal/services/types" "github.com/sorintlab/agola/internal/services/types"
"github.com/sorintlab/agola/internal/util" "github.com/sorintlab/agola/internal/util"
errors "golang.org/x/xerrors" errors "golang.org/x/xerrors"
) )