Update pkg/runtime to fix the error success log

Due to a bug in reconcile ResultFinalizer, the Ready=True condition on
an ImageRepository object from the previous reconciliation wasn't
getting updated even when the reconciliation failed, for example due to
image scan failure.

When the ResultFinalizer receives an object with stale Ready=True with
message "successful scan: found x tags" from the previous successful
reconciliation, Reconciling=True to indicate in-progress reconciliation
and a reconciliation error, ResultFinalizer updates Ready value if it's
True. But the check was performed using `conditions.IsReady()` which
also takes into consideration the Reconciling and Stalled values in the
status. Due to the presence of Reconciling=True, even though Ready was
True, `conditions.IsReady()` returned False, and ResultFinalizer skips
updating the Ready value, resulting in a fully reconciled final object
status with Reconciling and Ready both True, which is an incorrect
reconciliation status result.
ResultFinalizer now uses `conditions.IsTrue(obj, meta.ReadyCondition)`
to precisely check if only Ready=True is present.

Also, remove ExternalEventRecorder from ImageRepositoryReconciler, which
is no longer used and add a missing return on progressive status
patching failure.

Signed-off-by: Sunny <[email protected]>

Author: darkowlzz

controllers/imagerepository_controller.go

@@ -49,7 +49,6 @@ import (
 	"github.com/fluxcd/pkg/oci/auth/login"
 	"github.com/fluxcd/pkg/runtime/conditions"
 	helper "github.com/fluxcd/pkg/runtime/controller"
-	"github.com/fluxcd/pkg/runtime/events"
 	"github.com/fluxcd/pkg/runtime/patch"
 	"github.com/fluxcd/pkg/runtime/predicates"
 	"github.com/fluxcd/pkg/runtime/reconcile"
@@ -108,9 +107,8 @@ type ImageRepositoryReconciler struct {
 	kuberecorder.EventRecorder
 	helper.Metrics
 
-	ControllerName        string
-	ExternalEventRecorder *events.Recorder
-	Database              interface {
+	ControllerName string
+	Database       interface {
 		DatabaseWriter
 		DatabaseReader
 	}
@@ -286,6 +284,7 @@ func (r *ImageRepositoryReconciler) reconcile(ctx context.Context, sp *patch.Ser
 		reconcile.ProgressiveStatus(false, obj, meta.ProgressingReason, "scanning: %s", reasonMsg)
 		if err := sp.Patch(ctx, obj, r.patchOptions...); err != nil {
 			result, retErr = ctrl.Result{}, err
+			return
 		}
 
 		tags, err := r.scan(ctx, obj, ref, opts)

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/fluxcd/pkg/apis/event v0.4.1
 	github.com/fluxcd/pkg/apis/meta v0.19.1
 	github.com/fluxcd/pkg/oci v0.21.1
-	github.com/fluxcd/pkg/runtime v0.31.0
+	github.com/fluxcd/pkg/runtime v0.32.0
 	github.com/fluxcd/pkg/version v0.2.1
 	github.com/google/go-containerregistry v0.13.0
 	github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230307034325-57f010d26af8

go.sum

@@ -212,8 +212,8 @@ github.com/fluxcd/pkg/apis/meta v0.19.1 h1:fCI5CnTXpAqr67UlaI9q0H+OztMKB5kDTr6xV
 github.com/fluxcd/pkg/apis/meta v0.19.1/go.mod h1:ZPPMYrPnWwPQYNEGM/Uc0N4SurUPS3xNI3IIpCQEfuM=
 github.com/fluxcd/pkg/oci v0.21.1 h1:9kn19wkabE2xB77NRlOtMJlSYhZmUjdloZCzlHdAS6s=
 github.com/fluxcd/pkg/oci v0.21.1/go.mod h1:9E2DBlQII7YmeWt2ieTh38wwkiBqx3yg5NEJ51uefaA=
-github.com/fluxcd/pkg/runtime v0.31.0 h1:addyXaANHl/A68bEjCbiR4HzcFKgfXv1eaG7B7ZHxOo=
-github.com/fluxcd/pkg/runtime v0.31.0/go.mod h1:toGOOubMo4ZC1aWhB8C3drdTglr1/A1dETeNwjiIv0g=
+github.com/fluxcd/pkg/runtime v0.32.0 h1:GwPyl27qs0jg95o8lGQD+FiAAxFPJMKs58L63AQRk50=
+github.com/fluxcd/pkg/runtime v0.32.0/go.mod h1:toGOOubMo4ZC1aWhB8C3drdTglr1/A1dETeNwjiIv0g=
 github.com/fluxcd/pkg/version v0.2.1 h1:RRH7+6qiWHdTvRNwpoBmilnubJ2C4FZYGgy5wTDVKVc=
 github.com/fluxcd/pkg/version v0.2.1/go.mod h1:UmUYHDz4BxHQMesMUx3gYVrT2Wf66H49JpTg/PW+/OY=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=