fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

helm: only use Digest to calculcate index revision 

In #1001 bits around the Helm repository reconciliation logic were
rewritten, mostly based on the documented behavior instead of the
actual code. This resulted in the reintroduction of a YAML marshal of
the (sorted) index YAML instead of reliance of just the checksum of the
file.

This to take situations into account in which a repository would e.g.
provide a new random order on every generation. However, this approach
is (extremely) expensive as the marshal goes through a JSON -> YAML
loop, eating lots of RAM in the process.

As the further (silently) introduced behavior has not resulted in any
reported issues, I deem this approach safe and better than e.g.
encoding to just JSON which would still require a substantial amount of
memory.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2023-02-22 22:35:30 +01:00
parent 568b9324ce
commit c0a1099719
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/helmrepository_controller.go
View File

@ -475,8 +475,7 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, sp *patc
} }
if curDig.Validate() == nil { if curDig.Validate() == nil {
// Short-circuit based on the fetched index being an exact match to the // Short-circuit based on the fetched index being an exact match to the
// stored Artifact. This prevents having to unmarshal the YAML to calculate // stored Artifact.
// the (stable) revision, which is a memory expensive operation.
if newDig := chartRepo.Digest(curDig.Algorithm()); newDig.Validate() == nil && (newDig == curDig) { if newDig := chartRepo.Digest(curDig.Algorithm()); newDig.Validate() == nil && (newDig == curDig) {
*artifact = *curArtifact *artifact = *curArtifact
conditions.Delete(obj, sourcev1.FetchFailedCondition) conditions.Delete(obj, sourcev1.FetchFailedCondition)
@ -501,11 +500,11 @@ func (r *HelmRepositoryReconciler) reconcileSource(ctx context.Context, sp *patc
var changed bool var changed bool
if artifact := obj.Status.Artifact; artifact != nil { if artifact := obj.Status.Artifact; artifact != nil {
curRev := digest.Digest(sourcev1.TransformLegacyRevision(artifact.Revision)) curRev := digest.Digest(sourcev1.TransformLegacyRevision(artifact.Revision))
changed = curRev.Validate() != nil || curRev != chartRepo.Revision(curRev.Algorithm()) changed = curRev.Validate() != nil || curRev != chartRepo.Digest(curRev.Algorithm())
} }
// Calculate revision. // Calculate revision.
revision := chartRepo.Revision(intdigest.Canonical) revision := chartRepo.Digest(intdigest.Canonical)
if revision.Validate() != nil { if revision.Validate() != nil {
e := &serror.Event{ e := &serror.Event{
Err: fmt.Errorf("failed to calculate revision: %w", err), Err: fmt.Errorf("failed to calculate revision: %w", err),

2
internal/helm/repository/chart_repository.go
View File

@ -386,6 +386,8 @@ func (r *ChartRepository) DownloadIndex(w io.Writer) (err error) {
// Revision returns the revision of the ChartRepository's Index. It assumes // Revision returns the revision of the ChartRepository's Index. It assumes
// the Index is stable sorted. // the Index is stable sorted.
// Deprecated: because of expensive memory usage of (YAML) marshal operations.
// We only use Digest now.
func (r *ChartRepository) Revision(algorithm digest.Algorithm) digest.Digest { func (r *ChartRepository) Revision(algorithm digest.Algorithm) digest.Digest {
if !r.HasIndex() { if !r.HasIndex() {
return "" return ""