helm: optimise chart loading

Avoid loading charts from cache if the checksum alredy exists in storage. In other words, if the same chart already exists, the reconciliation should be a no-op, and therefore can short-circuit long/heavy operations. Co-authored-by: Hidde Beydals <[email protected]> Signed-off-by: Paulo Gomes <[email protected]>
fluxcd · Apr 25, 2022 · 726e050 · 726e050
1 parent cfbe6ac
commit 726e050
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -410,19 +410,19 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, obj *sou
 	}
 	*chartRepo = *newChartRepo
 
-	// Load the cached repository index to ensure it passes validation.
-	if err := chartRepo.LoadFromCache(); err != nil {
-		e := &serror.Event{
-			Err:    fmt.Errorf("failed to load Helm repository from cache: %w", err),
-			Reason: sourcev1.IndexationFailedReason,
-		}
-		conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
-		return sreconcile.ResultEmpty, e
-	}
-	defer chartRepo.Unload()
-
 	// Mark observations about the revision on the object.
 	if !obj.GetArtifact().HasRevision(checksum) {
+		// Load the cached repository index to ensure it passes validation.
+		if err := chartRepo.LoadFromCache(); err != nil {
+			e := &serror.Event{
+				Err:    fmt.Errorf("failed to load Helm repository from cache: %w", err),
+				Reason: sourcev1.IndexationFailedReason,
+			}
+			conditions.MarkTrue(obj, sourcev1.FetchFailedCondition, e.Reason, e.Err.Error())
+			return sreconcile.ResultEmpty, e
+		}
+		chartRepo.Unload()
+
 		message := fmt.Sprintf("new index revision '%s'", checksum)
 		conditions.MarkTrue(obj, sourcev1.ArtifactOutdatedCondition, "NewRevision", message)
 		conditions.MarkReconciling(obj, "NewRevision", message)