Merge pull request #1615 from fluxcd/backport-1614-to-release/v1.8.x

matheuscscp · web-flow · commit 22ec318879cb · 2026-03-10T19:41:54.000Z
[release/v1.8.x] Fix enqueing the same revision while reconciling
diff --git a/internal/controller/kustomization_indexers.go b/internal/controller/kustomization_indexers.go
@@ -57,9 +57,10 @@ func (r *KustomizationReconciler) requestsForRevisionChangeOf(indexKey string) h
 		}
 		var dd []dependency.Dependent
 		for i, d := range list.Items {
-			// If the Kustomization is ready and the revision of the artifact equals
+			// If the Kustomization is ready or reconciling and the revision of the artifact equals
 			// to the last attempted revision, we should not make a request for this Kustomization
-			if conditions.IsReady(&list.Items[i]) && repo.GetArtifact().HasRevision(d.Status.LastAttemptedRevision) {
+			if (conditions.IsReady(&list.Items[i]) || conditions.IsReconciling(&list.Items[i])) &&
+				repo.GetArtifact().HasRevision(d.Status.LastAttemptedRevision) {
 				continue
 			}
 			dd = append(dd, d.DeepCopy())

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,10 @@ func (r *KustomizationReconciler) requestsForRevisionChangeOf(indexKey string) h`
`57`	`57`	`}`
`58`	`58`	`var dd []dependency.Dependent`
`59`	`59`	`for i, d := range list.Items {`
`60`		`- // If the Kustomization is ready and the revision of the artifact equals`
	`60`	`+ // If the Kustomization is ready or reconciling and the revision of the artifact equals`
`61`	`61`	`// to the last attempted revision, we should not make a request for this Kustomization`
`62`		`- if conditions.IsReady(&list.Items[i]) && repo.GetArtifact().HasRevision(d.Status.LastAttemptedRevision) {`
	`62`	`+ if (conditions.IsReady(&list.Items[i]) \|\| conditions.IsReconciling(&list.Items[i])) &&`
	`63`	`+ repo.GetArtifact().HasRevision(d.Status.LastAttemptedRevision) {`
`63`	`64`	`continue`
`64`	`65`	`}`
`65`	`66`	`dd = append(dd, d.DeepCopy())`