Merge pull request #703 from fluxcd/fix-hr-reconcile-loop

relu · web-flow · commit 053a20f32ca3 · 2023-06-20T14:14:11.000+02:00
Fix HelmRelease reconciliation loop
diff --git a/internal/controller/helmrelease_controller.go b/internal/controller/helmrelease_controller.go
@@ -483,6 +483,10 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,
 	}
 
 	hr.Status.LastReleaseRevision = util.ReleaseRevision(rel)
+	if updateStatusErr := r.patchStatus(ctx, &hr); updateStatusErr != nil {
+		log.Error(updateStatusErr, "unable to update status after state update")
+		return hr, updateStatusErr
+	}
 
 	if err != nil {
 		reason := v2.ReconciliationFailedReason

Original file line number	Diff line number	Diff line change
`@@ -483,6 +483,10 @@ func (r *HelmReleaseReconciler) reconcileRelease(ctx context.Context,`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`hr.Status.LastReleaseRevision = util.ReleaseRevision(rel)`
	`486`	`+ if updateStatusErr := r.patchStatus(ctx, &hr); updateStatusErr != nil {`
	`487`	`+ log.Error(updateStatusErr, "unable to update status after state update")`
	`488`	`+ return hr, updateStatusErr`
	`489`	`+ }`
`486`	`490`
`487`	`491`	`if err != nil {`
`488`	`492`	`reason := v2.ReconciliationFailedReason`