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

fix requestForOCIRepository change 

Use artifact digest instead of revision to validate whether to trigger a
new reconciliation

Signed-off-by: Soule BA <bah.soule@gmail.com>
This commit is contained in:
Soule BA 2024-04-15 17:15:42 +02:00
parent f5447b4430
commit a98d9574d6
No known key found for this signature in database
GPG Key ID: 4D40965192802994
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/controller/helmrelease_controller.go
View File

@ -800,11 +800,19 @@ func (r *HelmReleaseReconciler) requestsForOCIRrepositoryChange(ctx context.Cont
var reqs []reconcile.Request var reqs []reconcile.Request
for i, hr := range list.Items { for i, hr := range list.Items {
// If the HelmRelease is ready and the revision of the artifact equals to the // If the HelmRelease is ready and the digest of the artifact equals to the
// last attempted revision, we should not make a request for this HelmRelease // last attempted revision digest, we should not make a request for this HelmRelease,
if conditions.IsReady(&list.Items[i]) && or.GetArtifact().HasRevision(hr.Status.GetLastAttemptedRevision()) { // likewise if we cannot retrieve the artifact digest.
digest := extractDigest(or.GetArtifact().Revision)
if digest == "" {
ctrl.LoggerFrom(ctx).Error(fmt.Errorf("wrong digest for %T", or), "failed to get requests for OCIRepository change")
continue continue
} }
if digest == hr.Status.LastAttemptedRevisionDigest {
continue
}
reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&list.Items[i])}) reqs = append(reqs, reconcile.Request{NamespacedName: client.ObjectKeyFromObject(&list.Items[i])})
} }
return reqs return reqs
@ -855,6 +863,9 @@ func getNamespacedName(obj *v2.HelmRelease) (types.NamespacedName, error) {
switch { switch {
case obj.HasChartRef() && !obj.HasChartTemplate(): case obj.HasChartRef() && !obj.HasChartTemplate():
namespacedName.Namespace = obj.Spec.ChartRef.Namespace namespacedName.Namespace = obj.Spec.ChartRef.Namespace
if namespacedName.Namespace == "" {
namespacedName.Namespace = obj.GetNamespace()
}
namespacedName.Name = obj.Spec.ChartRef.Name namespacedName.Name = obj.Spec.ChartRef.Name
case !obj.HasChartRef() && obj.HasChartTemplate(): case !obj.HasChartRef() && obj.HasChartTemplate():
namespacedName.Namespace = obj.Spec.Chart.GetNamespace(obj.GetNamespace()) namespacedName.Namespace = obj.Spec.Chart.GetNamespace(obj.GetNamespace())
@ -891,7 +902,7 @@ func mutateChartWithSourceRevision(chart *chart.Chart, source source.Source) (st
} }
// algotithm are sha256, sha384, sha512 with the canonical being sha256 // algotithm are sha256, sha384, sha512 with the canonical being sha256
// So every digest starts with a sha algorithm and a colon // So every digest starts with a sha algorithm and a colon
sha, err := extractDigetString(tagD[1]) sha, err := extractDigestSubString(tagD[1])
if err != nil { if err != nil {
return "", err return "", err
} }
@ -903,7 +914,7 @@ func mutateChartWithSourceRevision(chart *chart.Chart, source source.Source) (st
ociDigest = tagD[1] ociDigest = tagD[1]
default: default:
// default to the digest // default to the digest
sha, err := extractDigetString(revision) sha, err := extractDigestSubString(revision)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -918,8 +929,9 @@ func mutateChartWithSourceRevision(chart *chart.Chart, source source.Source) (st
return ociDigest, nil return ociDigest, nil
} }
func extractDigetString(revision string) (string, error) { func extractDigestSubString(revision string) (string, error) {
var sha string var sha string
// expects a revision in the <algorithm>:<digest> format
if pair := strings.Split(revision, ":"); len(pair) != 2 { if pair := strings.Split(revision, ":"); len(pair) != 2 {
return "", fmt.Errorf("invalid artifact revision %s", revision) return "", fmt.Errorf("invalid artifact revision %s", revision)
} else { } else {
@ -930,3 +942,17 @@ func extractDigetString(revision string) (string, error) {
} }
return sha[0:12], nil return sha[0:12], nil
} }
func extractDigest(revision string) string {
if strings.Contains(revision, "@") {
// expects a revision in the <version>@<algorithm>:<digest> format
tagD := strings.Split(revision, "@")
if len(tagD) != 2 {
return ""
}
return tagD[1]
} else {
// revision in the <algorithm>:<digest> format
return revision
}
}