github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Extended defaults for jobs.

Browse Source 
Currently jobs will only default completions and parallelism. This adds
copying labels map for pod's template as selectors, similarly how it's done
in replication controller.
This commit is contained in:
Maciej Szulik 2015-09-21 12:53:25 +02:00
parent 0525e6e1e6
commit 5d3b4de435
3 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,19 @@ func addDefaultingFuncs() {
}
},
func(obj *Job) {
var labels map[string]string
if obj.Spec.Template != nil {
labels = obj.Spec.Template.Labels
}
// TODO: support templates defined elsewhere when we support them in the API
if labels != nil {
if len(obj.Spec.Selector) == 0 {
obj.Spec.Selector = labels
}
if len(obj.Labels) == 0 {
obj.Labels = labels
}
}
if obj.Spec.Completions == nil {
completions := 1
obj.Spec.Completions = &completions

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

@ -192,20 +192,48 @@ func TestSetDefaultDeployment(t *testing.T) {
func TestSetDefaultJob(t *testing.T) {
expected := &Job{
Spec: JobSpec{
Selector: map[string]string{"job": "selector"},
Completions: newInt(1),
Parallelism: newInt(2),
},
}
tests := []*Job{
{},
// selector set explicitly, completions and parallelism - default
{
Spec: JobSpec{
Selector: map[string]string{"job": "selector"},
},
},
// selector from template labels, completions and parallelism - default
{
Spec: JobSpec{
Template: &v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},
},
},
},
},
// selector from template labels, completions set explicitly, parallelism - default
{
Spec: JobSpec{
Completions: newInt(1),
Template: &v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},
},
},
},
},
// selector from template labels, completions - default, parallelism set explicitly
{
Spec: JobSpec{
Parallelism: newInt(2),
Template: &v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},
},
},
},
},
}
@ -223,6 +251,9 @@ func TestSetDefaultJob(t *testing.T) {
if *got.Spec.Parallelism != *expected.Spec.Parallelism {
t.Errorf("got different parallelism than expected: %d %d", *got.Spec.Parallelism, *expected.Spec.Parallelism)
}
if !reflect.DeepEqual(got.Spec.Selector, expected.Spec.Selector) {
t.Errorf("got different selectors %#v %#v", got.Spec.Selector, expected.Spec.Selector)
}
}
}

2
pkg/apis/experimental/v1/types.go
View File

@ -407,7 +407,7 @@ type JobSpec struct {
Completions *int `json:"completions,omitempty"`
// Selector is a label query over pods that should match the pod count.
Selector map[string]string `json:"selector"`
Selector map[string]string `json:"selector,omitempty"`
// Template is the object that describes the pod that will be created when
// executing a job.