controllers: emit event and log source up-to-date

darkowlzz · darkowlzz · commit b41c717e167a · 2022-03-30T17:06:16.000+05:30
Signed-off-by: Sunny &lt;darkowlzz@protonmail.com&gt;
diff --git a/api/v1beta2/condition_types.go b/api/v1beta2/condition_types.go
@@ -93,4 +93,8 @@ const (
 
 	// SymlinkUpdateFailedReason signals a failure in updating a symlink.
 	SymlinkUpdateFailedReason string = "SymlinkUpdateFailed"
+
+	// ArtifactUpToDateReason signals that an existing Artifact is up-to-date
+	// with the Source.
+	ArtifactUpToDateReason string = "ArtifactUpToDate"
 )
diff --git a/controllers/bucket_controller.go b/controllers/bucket_controller.go
@@ -526,7 +526,7 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
 
 	// The artifact is up-to-date
 	if obj.GetArtifact().HasRevision(artifact.Revision) {
-		ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)
+		r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
 		return sreconcile.ResultSuccess, nil
 	}
 
diff --git a/controllers/gitrepository_controller.go b/controllers/gitrepository_controller.go
@@ -462,7 +462,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,
 
 	// The artifact is up-to-date
 	if obj.GetArtifact().HasRevision(artifact.Revision) && !includes.Diff(obj.Status.IncludedArtifacts) {
-		ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)
+		r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
 		return sreconcile.ResultSuccess, nil
 	}
 
diff --git a/controllers/helmchart_controller.go b/controllers/helmchart_controller.go
@@ -638,7 +638,7 @@ func (r *HelmChartReconciler) reconcileArtifact(ctx context.Context, obj *source
 
 	// Return early if the build path equals the current artifact path
 	if curArtifact := obj.GetArtifact(); curArtifact != nil && r.Storage.LocalPath(*curArtifact) == b.Path {
-		ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)
+		r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
 		return sreconcile.ResultSuccess, nil
 	}
 
diff --git a/controllers/helmrepository_controller.go b/controllers/helmrepository_controller.go
@@ -411,7 +411,7 @@ func (r *HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *s
 	}()
 
 	if obj.GetArtifact().HasRevision(artifact.Revision) {
-		ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)
+		r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)
 		return sreconcile.ResultSuccess, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,8 @@ const (`
`93`	`93`
`94`	`94`	`// SymlinkUpdateFailedReason signals a failure in updating a symlink.`
`95`	`95`	`SymlinkUpdateFailedReason string = "SymlinkUpdateFailed"`
	`96`	`+`
	`97`	`+ // ArtifactUpToDateReason signals that an existing Artifact is up-to-date`
	`98`	`+ // with the Source.`
	`99`	`+ ArtifactUpToDateReason string = "ArtifactUpToDate"`
`96`	`100`	`)`
Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ func (r BucketReconciler) reconcileArtifact(ctx context.Context, obj sourcev1.`
`526`	`526`
`527`	`527`	`// The artifact is up-to-date`
`528`	`528`	`if obj.GetArtifact().HasRevision(artifact.Revision) {`
`529`		`- ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)`
	`529`	`+ r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)`
`530`	`530`	`return sreconcile.ResultSuccess, nil`
`531`	`531`	`}`
`532`	`532`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context,`
`462`	`462`
`463`	`463`	`// The artifact is up-to-date`
`464`	`464`	`if obj.GetArtifact().HasRevision(artifact.Revision) && !includes.Diff(obj.Status.IncludedArtifacts) {`
`465`		`- ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)`
	`465`	`+ r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)`
`466`	`466`	`return sreconcile.ResultSuccess, nil`
`467`	`467`	`}`
`468`	`468`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ func (r HelmChartReconciler) reconcileArtifact(ctx context.Context, obj source`
`638`	`638`
`639`	`639`	`// Return early if the build path equals the current artifact path`
`640`	`640`	`if curArtifact := obj.GetArtifact(); curArtifact != nil && r.Storage.LocalPath(*curArtifact) == b.Path {`
`641`		`- ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)`
	`641`	`+ r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)`
`642`	`642`	`return sreconcile.ResultSuccess, nil`
`643`	`643`	`}`
`644`	`644`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ func (r HelmRepositoryReconciler) reconcileArtifact(ctx context.Context, obj s`
`411`	`411`	`}()`
`412`	`412`
`413`	`413`	`if obj.GetArtifact().HasRevision(artifact.Revision) {`
`414`		`- ctrl.LoggerFrom(ctx).Info("artifact up-to-date", "revision", artifact.Revision)`
	`414`	`+ r.eventLogf(ctx, obj, events.EventTypeTrace, sourcev1.ArtifactUpToDateReason, "artifact up-to-date with remote revision: '%s'", artifact.Revision)`
`415`	`415`	`return sreconcile.ResultSuccess, nil`
`416`	`416`	`}`
`417`	`417`