From a984eb3760c8b5da4ddcd5ac6b0cf32476492182 Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Wed, 23 Sep 2015 13:25:58 +0200 Subject: [PATCH] Issue 14385: job's parallelism defaults to completions. --- pkg/apis/experimental/v1/defaults.go | 3 +-- pkg/apis/experimental/v1/defaults_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/apis/experimental/v1/defaults.go b/pkg/apis/experimental/v1/defaults.go index 952b1ecd48..b2cabf5415 100644 --- a/pkg/apis/experimental/v1/defaults.go +++ b/pkg/apis/experimental/v1/defaults.go @@ -94,8 +94,7 @@ func addDefaultingFuncs() { obj.Spec.Completions = &completions } if obj.Spec.Parallelism == nil { - parallelism := 2 - obj.Spec.Parallelism = ¶llelism + obj.Spec.Parallelism = obj.Spec.Completions } }, ) diff --git a/pkg/apis/experimental/v1/defaults_test.go b/pkg/apis/experimental/v1/defaults_test.go index a1979532db..ffa48b391e 100644 --- a/pkg/apis/experimental/v1/defaults_test.go +++ b/pkg/apis/experimental/v1/defaults_test.go @@ -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"},