Merge pull request #14575 from soltysh/jobs_podtemplate_not_pointer

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-10-15 03:28:19 -07:00
16 changed files with 43 additions and 85 deletions

View File

@@ -414,7 +414,7 @@ func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *ex
for i := 0; i < diff; i++ {
go func() {
defer wait.Done()
if err := jm.podControl.CreatePods(job.Namespace, job.Spec.Template, job); err != nil {
if err := jm.podControl.CreatePods(job.Namespace, &job.Spec.Template, job); err != nil {
defer util.HandleError(err)
// Decrement the expected number of creates because the informer won't observe this pod
jm.expectations.CreationObserved(jobKey)

View File

@@ -44,7 +44,7 @@ func newJob(parallelism, completions int) *extensions.Job {
Parallelism: &parallelism,
Completions: &completions,
Selector: map[string]string{"foo": "bar"},
Template: &api.PodTemplateSpec{
Template: api.PodTemplateSpec{
ObjectMeta: api.ObjectMeta{
Labels: map[string]string{
"foo": "bar",