github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14417 from soltysh/issue14385 

Issue 14385: job's parallelism defaults to completions.
pull/6/head
Eric Tune 2015-09-24 14:25:22 -07:00
parent 43b37204ec a984eb3760
commit a518a27354
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apis/experimental/v1/defaults.go
View File

@ -94,8 +94,7 @@ func addDefaultingFuncs() {
obj.Spec.Completions = &completions
}
if obj.Spec.Parallelism == nil {
parallelism := 2
obj.Spec.Parallelism = &parallelism
obj.Spec.Parallelism = obj.Spec.Completions
}
},
)

4
pkg/apis/experimental/v1/defaults_test.go
View File

@ -194,7 +194,7 @@ func TestSetDefaultJob(t *testing.T) {
Spec: JobSpec{
Selector: map[string]string{"job": "selector"},
Completions: newInt(1),
Parallelism: newInt(2),
Parallelism: newInt(1),
},
}
tests := []*Job{
@ -228,7 +228,7 @@ func TestSetDefaultJob(t *testing.T) {
// selector from template labels, completions - default, parallelism set explicitly
{
Spec: JobSpec{
Parallelism: newInt(2),
Parallelism: newInt(1),
Template: &v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},