From 7ca393498ca224b62e25b41d40374e9085c47578 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Wed, 23 Mar 2022 19:28:05 +0100 Subject: [PATCH] Prefix event annotations with API Group FQDN This to facilitate improvements on the notification-controller side, where annotations prefixed with the FQDN of the Group of the Involved Object will be transformed into "fields". Signed-off-by: Hidde Beydals --- controllers/bucket_controller.go | 4 ++-- controllers/gitrepository_controller.go | 4 ++-- controllers/helmchart_controller.go | 4 ++-- controllers/helmrepository_controller.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go index 46a6bc64bf..84a4e38c59 100644 --- a/controllers/bucket_controller.go +++ b/controllers/bucket_controller.go @@ -570,8 +570,8 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1. return sreconcile.ResultEmpty, e } r.annotatedEventLogf(ctx, obj, map[string]string{ - "revision": artifact.Revision, - "checksum": artifact.Checksum, + sourcev1.GroupVersion.Group + "/revision": artifact.Revision, + sourcev1.GroupVersion.Group + "/checksum": artifact.Checksum, }, corev1.EventTypeNormal, "NewArtifact", "fetched %d files from '%s'", index.Len(), obj.Spec.BucketName) // Record it on the object diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go index 79a693712d..69892ca94b 100644 --- a/controllers/gitrepository_controller.go +++ b/controllers/gitrepository_controller.go @@ -519,8 +519,8 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, return sreconcile.ResultEmpty, e } r.AnnotatedEventf(obj, map[string]string{ - "revision": artifact.Revision, - "checksum": artifact.Checksum, + sourcev1.GroupVersion.Group + "/revision": artifact.Revision, + sourcev1.GroupVersion.Group + "/checksum": artifact.Checksum, }, corev1.EventTypeNormal, "NewArtifact", "stored artifact for commit '%s'", commit.ShortMessage()) // Record it on the object diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go index d6c2e4e11f..3fa0c0271c 100644 --- a/controllers/helmchart_controller.go +++ b/controllers/helmchart_controller.go @@ -676,8 +676,8 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source // Publish an event r.AnnotatedEventf(obj, map[string]string{ - "revision": artifact.Revision, - "checksum": artifact.Checksum, + sourcev1.GroupVersion.Group + "/revision": artifact.Revision, + sourcev1.GroupVersion.Group + "/checksum": artifact.Checksum, }, corev1.EventTypeNormal, reasonForBuild(b), b.Summary()) // Update symlink on a "best effort" basis diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go index 1a2c3087a6..618cd35a69 100644 --- a/controllers/helmrepository_controller.go +++ b/controllers/helmrepository_controller.go @@ -453,8 +453,8 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s size := units.HumanSize(float64(fi.Size())) r.AnnotatedEventf(obj, map[string]string{ - "revision": artifact.Revision, - "checksum": artifact.Checksum, + sourcev1.GroupVersion.Group + "/revision": artifact.Revision, + sourcev1.GroupVersion.Group + "/checksum": artifact.Checksum, }, corev1.EventTypeNormal, "NewArtifact", "fetched index of size %s from '%s'", size, chartRepo.URL) // Record it on the object.