github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Issue 14385: job's parallelism defaults to completions.

Browse Source
This commit is contained in:
Maciej Szulik 2015-09-23 13:25:58 +02:00
parent 28585bc699
commit a984eb3760
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 obj.Spec.Completions = &completions
} }
if obj.Spec.Parallelism == nil { if obj.Spec.Parallelism == nil {
parallelism := 2 obj.Spec.Parallelism = obj.Spec.Completions
obj.Spec.Parallelism = &parallelism
} }
}, },
) )

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

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