Merge pull request kubernetes#41658 from janetkuo/cronjob-panic

Automatic merge from submit-queue (batch tested with PRs 41649, 41658, 41266, 41371, 41626) Fix cronjob controller panic on status update failure kubernetes#41655 @kubernetes/sig-apps-bugs @soltysh @erictune
lavalamp · Feb 18, 2017 · b584e94 · b584e94
2 parents 77a6338 + 6753544
commit b584e94
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/controller/cronjob/cronjob_controller.go b/pkg/controller/cronjob/cronjob_controller.go
@@ -167,6 +167,7 @@ func SyncOne(sj batch.CronJob, js []batch.Job, now time.Time, jc jobControlInter
 	updatedSJ, err := sjc.UpdateStatus(&sj)
 	if err != nil {
 		glog.Errorf("Unable to update status for %s (rv = %s): %v", nameForLog, sj.ResourceVersion, err)
+		return
 	}
 	sj = *updatedSJ