From 4d18823ec264917ad3856824122e3536564105a2 Mon Sep 17 00:00:00 2001 From: Thor <1187526662@qq.com> Date: Fri, 3 Jul 2020 16:32:43 +0800 Subject: [PATCH] fix issue 890 Signed-off-by: Thor <1187526662@qq.com> --- pkg/controllers/job/job_controller_actions.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go index 715c94a776..364fdb347b 100644 --- a/pkg/controllers/job/job_controller_actions.go +++ b/pkg/controllers/job/job_controller_actions.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog" @@ -147,20 +147,20 @@ func (cc *Controller) initiateJob(job *batch.Job) (*batch.Job, error) { defer klog.V(3).Infof("Finished Job <%s/%s> initiate", job.Namespace, job.Name) klog.Infof("Current Version is: %d of job: %s/%s", job.Status.Version, job.Namespace, job.Name) - job, err := cc.initJobStatus(job) + jobInstance, err := cc.initJobStatus(job) if err != nil { cc.recorder.Event(job, v1.EventTypeWarning, string(batch.JobStatusError), fmt.Sprintf("Failed to initialize job status, err: %v", err)) return nil, err } - if err := cc.pluginOnJobAdd(job); err != nil { + if err := cc.pluginOnJobAdd(jobInstance); err != nil { cc.recorder.Event(job, v1.EventTypeWarning, string(batch.PluginError), fmt.Sprintf("Execute plugin when job add failed, err: %v", err)) return nil, err } - newJob, err := cc.createJobIOIfNotExist(job) + newJob, err := cc.createJobIOIfNotExist(jobInstance) if err != nil { cc.recorder.Event(job, v1.EventTypeWarning, string(batch.PVCError), fmt.Sprintf("Failed to create PVC, err: %v", err))