Skip to content

Commit 0d50ac3

Browse files
committed
Use MetaDigestKey from event API
Signed-off-by: Hidde Beydals <hello@hidde.co>
1 parent 4e014ff commit 0d50ac3

6 files changed

+7
-7
lines changed

controllers/bucket_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ func (r *BucketReconciler) notify(ctx context.Context, oldObj, newObj *sourcev1.
331331
fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
332332
}
333333
if newObj.Status.Artifact.Digest != "" {
334-
annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
334+
annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
335335
}
336336

337337
var oldChecksum string

controllers/gitrepository_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ func (r *GitRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *so
328328
fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
329329
}
330330
if newObj.Status.Artifact.Digest != "" {
331-
annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
331+
annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
332332
}
333333

334334
var oldChecksum string

controllers/helmchart_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func (r *HelmChartReconciler) notify(ctx context.Context, oldObj, newObj *source
334334
fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
335335
}
336336
if newObj.Status.Artifact.Digest != "" {
337-
annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
337+
annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
338338
}
339339

340340
var oldChecksum string

controllers/helmrepository_controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ func (r *HelmRepositoryReconciler) notify(ctx context.Context, oldObj, newObj *s
294294
fmt.Sprintf("%s/%s", sourcev1.GroupVersion.Group, eventv1.MetaChecksumKey): newObj.Status.Artifact.Checksum,
295295
}
296296
if newObj.Status.Artifact.Digest != "" {
297-
annotations[sourcev1.GroupVersion.Group+"/digest"] = newObj.Status.Artifact.Digest
297+
annotations[sourcev1.GroupVersion.Group+"/"+eventv1.MetaDigestKey] = newObj.Status.Artifact.Digest
298298
}
299299

300300
humanReadableSize := "unknown size"

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
github.com/docker/cli v20.10.23+incompatible
2424
github.com/docker/go-units v0.5.0
2525
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
26-
github.com/fluxcd/pkg/apis/event v0.3.0
26+
github.com/fluxcd/pkg/apis/event v0.4.0
2727
github.com/fluxcd/pkg/apis/meta v0.19.0
2828
github.com/fluxcd/pkg/git v0.9.0
2929
github.com/fluxcd/pkg/git/gogit v0.6.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,8 @@ github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4 h1:Gm5sGGk+/Wq6Rh
524524
github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4/go.mod h1:raWgfUV7lDQVXp4QXUaeNNJkRVKz97UQuF+0kdY7Vmo=
525525
github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
526526
github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
527-
github.com/fluxcd/pkg/apis/event v0.3.0 h1:B+IXmfSniUGfoczheNAH0YULgS+ejxMl58RyWlvLa1c=
528-
github.com/fluxcd/pkg/apis/event v0.3.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
527+
github.com/fluxcd/pkg/apis/event v0.4.0 h1:UPCC269KjgKgkmtiCiBq/DNue/EpXy8Tq1zFx7oRXZM=
528+
github.com/fluxcd/pkg/apis/event v0.4.0/go.mod h1:xYOOlf+9gCBSYcs93N2XAbJvSVwuVBDBUzqhR+cAo7M=
529529
github.com/fluxcd/pkg/apis/meta v0.19.0 h1:CX75e/eaRWZDTzNdMSWomY1InlssLKcS8GQDSg/aopI=
530530
github.com/fluxcd/pkg/apis/meta v0.19.0/go.mod h1:7b6prDPsViyAzoY7eRfSPS0/MbXpGGsOMvRq2QrTKa4=
531531
github.com/fluxcd/pkg/git v0.9.0 h1:e/RBMBe9rGUEi+B4DQpVPmDmAyHGj/fztqxTUeUxnsM=

0 commit comments

Comments
 (0)