Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed duplicated conditional and improved logging message #362

Merged
merged 1 commit into from
Oct 11, 2023
Merged

Removed duplicated conditional and improved logging message #362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions modules/common/job/job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}

Expand Down
Loading