fix: removing reconciliation status

Author: Skarlso

controllers/delivery/sync_controller.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"time"
 
-	eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
 	"github.com/fluxcd/pkg/runtime/conditions"
 	"github.com/fluxcd/pkg/runtime/patch"
@@ -31,7 +30,6 @@ import (
 	"github.com/open-component-model/git-controller/apis/delivery/v1alpha1"
 	mpasv1alpha1 "github.com/open-component-model/git-controller/apis/mpas/v1alpha1"
 	"github.com/open-component-model/git-controller/pkg"
-	"github.com/open-component-model/git-controller/pkg/event"
 	"github.com/open-component-model/git-controller/pkg/providers"
 )
 
@@ -89,8 +87,8 @@ func (r *SyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctr
 
 	// it's important that this happens here so any residual status condition can be overwritten / set.
 	if obj.Status.Digest != "" {
-		event.New(r.EventRecorder, obj, eventv1.EventSeverityInfo, fmt.Sprintf("sync object already synced with digest %s", obj.Status.Digest), nil)
-		conditions.MarkTrue(obj, meta.ReadyCondition, meta.SucceededReason, "Reconciliation success")
+		// we should be already Ready, deleting reconciling condition only.
+		conditions.Delete(obj, meta.ReconcilingCondition)
 
 		return ctrl.Result{}, nil
 	}
@@ -199,8 +197,7 @@ func (r *SyncReconciler) Reconcile(ctx context.Context, req ctrl.Request) (_ ctr
 		obj.Status.PullRequestID = id
 	}
 
-	conditions.MarkTrue(obj, meta.ReadyCondition, meta.SucceededReason, "Reconciliation success")
-	event.New(r.EventRecorder, obj, eventv1.EventSeverityInfo, "Reconciliation success", nil)
+	status.MarkReady(r.EventRecorder, obj, "Reconciliation success")
 
 	return ctrl.Result{}, nil
 }

controllers/mpas/repository_controller.go

@@ -9,9 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	eventv1 "github.com/fluxcd/pkg/apis/event/v1beta1"
 	"github.com/fluxcd/pkg/apis/meta"
-	"github.com/fluxcd/pkg/runtime/conditions"
 	"github.com/fluxcd/pkg/runtime/patch"
 	rreconcile "github.com/fluxcd/pkg/runtime/reconcile"
 	"github.com/open-component-model/ocm-controller/pkg/status"
@@ -24,7 +22,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	mpasv1alpha1 "github.com/open-component-model/git-controller/apis/mpas/v1alpha1"
-	"github.com/open-component-model/git-controller/pkg/event"
 	"github.com/open-component-model/git-controller/pkg/providers"
 )
 
@@ -107,7 +104,7 @@ func (r *RepositoryReconciler) reconcile(ctx context.Context, obj *mpasv1alpha1.
 
 	if err := r.Provider.CreateBranchProtection(ctx, *obj); err != nil {
 		if errors.Is(err, providers.NotSupportedError) {
-			r.markAsDone(obj)
+			status.MarkReady(r.EventRecorder, obj, "Successful reconciliation")
 
 			// ignore and return without branch protection rules.
 			return ctrl.Result{}, nil
@@ -119,12 +116,7 @@ func (r *RepositoryReconciler) reconcile(ctx context.Context, obj *mpasv1alpha1.
 		return ctrl.Result{}, err
 	}
 
-	r.markAsDone(obj)
+	status.MarkReady(r.EventRecorder, obj, "Successful reconciliation")
 
 	return ctrl.Result{}, nil
 }
-
-func (r *RepositoryReconciler) markAsDone(obj *mpasv1alpha1.Repository) {
-	conditions.MarkTrue(obj, meta.ReadyCondition, meta.SucceededReason, "Reconciliation success")
-	event.New(r.EventRecorder, obj, eventv1.EventSeverityInfo, "Reconciliation success", nil)
-}

go.mod

@@ -36,7 +36,7 @@ require (
 	github.com/go-logr/logr v1.2.4
 	github.com/google/go-github/v52 v52.0.0
 	github.com/open-component-model/ocm v0.4.0
-	github.com/open-component-model/ocm-controller v0.16.0
+	github.com/open-component-model/ocm-controller v0.16.1-0.20231115142704-81cfce8cc592
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/oauth2 v0.11.0
 	k8s.io/api v0.28.1

go.sum

@@ -1226,8 +1226,8 @@ github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/open-component-model/ocm v0.4.0 h1:S+rPJGoDnSvxhBn3QS2HXURxugTjCM4XWEJLZSaH6Ek=
 github.com/open-component-model/ocm v0.4.0/go.mod h1:7RAqaUMmA4BlwW5ZEUBm8amWIb1TL9FhNigNXQ6wiu0=
-github.com/open-component-model/ocm-controller v0.16.0 h1:yhZI95pg/DVs59RwOl41xcePaEVQMZDx0P5CKhhebqc=
-github.com/open-component-model/ocm-controller v0.16.0/go.mod h1:lYax3VEjWAZ7qEr90opJQl+qm/gO3wIeoz1WSEdje2c=
+github.com/open-component-model/ocm-controller v0.16.1-0.20231115142704-81cfce8cc592 h1:G9X+Fv/kEAxCZUUJJy5uPJfpnMHmAsLwq5RKfEjsEog=
+github.com/open-component-model/ocm-controller v0.16.1-0.20231115142704-81cfce8cc592/go.mod h1:lYax3VEjWAZ7qEr90opJQl+qm/gO3wIeoz1WSEdje2c=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
 github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=