Skip to content

refactor: simplify code #131

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor: simplify code #131

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
913665b
Make the code more concise and clearer.
bogo-y Aug 4, 2023
9e93e36
Make the code more concise and clearer.
bogo-y Aug 4, 2023
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
21 changes: 3 additions & 18 deletions pkg/controller/cronhorizontalpodautoscaler_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,23 +108,11 @@ func (r *ReconcileCronHorizontalPodAutoscaler) Reconcile(context context.Context
for _, cJob := range conditions {
skip := false
for _, job := range instance.Spec.Jobs {
if cJob.Name == job.Name {
// schedule has changed or RunOnce changed
if cJob.Schedule != job.Schedule || cJob.RunOnce != job.RunOnce || cJob.TargetSize != job.TargetSize {
// jobId exists and remove the job from cronManager
if cJob.JobId != "" {
err := r.CronManager.delete(cJob.JobId)
if err != nil {
log.Errorf("Failed to delete expired job %s in cronHPA %s namespace %s,because of %v", cJob.Name, instance.Name, instance.Namespace, err)
}
}
continue
}
// if nothing changed
if cJob.Name == job.Name && cJob.Schedule == job.Schedule && cJob.RunOnce == job.RunOnce && cJob.TargetSize == job.TargetSize {
skip = true
break
}
}

// need remove this condition because this is not job spec
if !skip {
if cJob.JobId != "" {
Expand All @@ -133,10 +121,7 @@ func (r *ReconcileCronHorizontalPodAutoscaler) Reconcile(context context.Context
log.Errorf("Failed to delete expired job %s in cronHPA %s namespace %s, because of %v", cJob.Name, instance.Name, instance.Namespace, err)
}
}
}

// if job nothing changed then append to left conditions
if skip {
} else {
leftConditions = append(leftConditions, cJob)
}
}
Expand Down