Merge pull request #42 from fluxcd/fix-git-sync

stefanprodan · web-flow · commit 9af721f43111 · 2020-04-27T11:14:50.000+03:00
git: Update status after sync failure
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -79,6 +79,9 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro
 	syncedRepo, err := r.sync(ctx, *repo.DeepCopy())
 	if err != nil {
 		log.Error(err, "Git repository sync failed")
+		if err := r.Status().Update(ctx, &syncedRepo); err != nil {
+			log.Error(err, "unable to update GitRepository status")
+		}
 		return ctrl.Result{Requeue: true}, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ func (r *GitRepositoryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, erro`
`79`	`79`	`syncedRepo, err := r.sync(ctx, *repo.DeepCopy())`
`80`	`80`	`if err != nil {`
`81`	`81`	`log.Error(err, "Git repository sync failed")`
	`82`	`+ if err := r.Status().Update(ctx, &syncedRepo); err != nil {`
	`83`	`+ log.Error(err, "unable to update GitRepository status")`
	`84`	`+ }`
`82`	`85`	`return ctrl.Result{Requeue: true}, err`
`83`	`86`	`}`
`84`	`87`