From 614cd0d524c1daadb90dcd70294fd1882d88fa25 Mon Sep 17 00:00:00 2001 From: Jiri Podivin Date: Mon, 9 Oct 2023 15:49:34 +0200 Subject: [PATCH] Removed duplicated conditional and expanded error message Signed-off-by: Jiri Podivin --- modules/common/job/job.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/common/job/job.go b/modules/common/job/job.go index f8e52db6..ff94a15b 100644 --- a/modules/common/job/job.go +++ b/modules/common/job/job.go @@ -145,12 +145,13 @@ func (j *Job) DoJob( // Check if this job already exists // j.actualJob, err = GetJobWithName(ctx, h, j.expectedJob.Name, j.expectedJob.Namespace) - if err != nil && !k8s_errors.IsNotFound(err) { - return ctrl.Result{}, err - } exists := !k8s_errors.IsNotFound(err) + if err != nil && exists { + return ctrl.Result{}, fmt.Errorf("error getting existing job %s : %w", j.jobType, err) + } + // If the hash of the job not changed then we don't need to create or wait // for any jobs if !j.changed { @@ -290,10 +291,7 @@ func GetJobWithName( job := &batchv1.Job{} err := h.GetClient().Get(ctx, types.NamespacedName{Name: name, Namespace: namespace}, job) if err != nil { - if k8s_errors.IsNotFound(err) { - return job, err - } - h.GetLogger().Info("GetJobWithName err") + h.GetLogger().Info("GetJobWithName %s err: %w", name, err) return job, err }