Merge pull request #41825 from janetkuo/automated-cherry-pick-of-#416…

…58-upstream-release-1.5 Automatic merge from submit-queue Automated cherry pick of #41658 upstream release 1.5 Automated cherry pick of #41658 upstream release 1.5 @soltysh @mwielgus
kubernetes · Feb 22, 2017 · 307530b · 307530b
2 parents 87b9e9e + 0fbebfb
commit 307530b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/pkg/controller/cronjob/controller.go b/pkg/controller/cronjob/controller.go
@@ -152,6 +152,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