github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for-loop and err definition

pull/6/head
zhangxiaoyu-zidif 2017-05-31 13:51:14 +08:00
parent 1fd6e97ad9
commit 6918109b31
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/cronjob/cronjob_controller.go
View File

@ -205,8 +205,7 @@ func syncOne(sj *batchv2alpha1.CronJob, js []batchv1.Job, now time.Time, jc jobC
nameForLog := fmt.Sprintf("%s/%s", sj.Namespace, sj.Name) nameForLog := fmt.Sprintf("%s/%s", sj.Namespace, sj.Name)
childrenJobs := make(map[types.UID]bool) childrenJobs := make(map[types.UID]bool)
for i := range js { for _, j := range js {
j := js[i]
childrenJobs[j.ObjectMeta.UID] = true childrenJobs[j.ObjectMeta.UID] = true
found := inActiveList(*sj, j.ObjectMeta.UID) found := inActiveList(*sj, j.ObjectMeta.UID)
if !found && !IsJobFinished(&j) { if !found && !IsJobFinished(&j) {
@ -366,11 +365,11 @@ func deleteJob(sj *batchv2alpha1.CronJob, job *batchv1.Job, jc jobControlInterfa
// TODO: this should be replaced with server side job deletion // TODO: this should be replaced with server side job deletion
// currencontinuetly this mimics JobReaper from pkg/kubectl/stop.go // currencontinuetly this mimics JobReaper from pkg/kubectl/stop.go
nameForLog := fmt.Sprintf("%s/%s", sj.Namespace, sj.Name) nameForLog := fmt.Sprintf("%s/%s", sj.Namespace, sj.Name)
var err error
// scale job down to 0 // scale job down to 0
if *job.Spec.Parallelism != 0 { if *job.Spec.Parallelism != 0 {
zero := int32(0) zero := int32(0)
var err error
job.Spec.Parallelism = &zero job.Spec.Parallelism = &zero
job, err = jc.UpdateJob(job.Namespace, job) job, err = jc.UpdateJob(job.Namespace, job)
if err != nil { if err != nil {