fixup! base reconciler reconciles status: new approach

Kuadrant · Jul 16, 2024 · 6473a4e · 6473a4e
1 parent 0b1f8cd
commit 6473a4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/api/v1beta2/ratelimitpolicy_types.go b/api/v1beta2/ratelimitpolicy_types.go
@@ -205,7 +205,6 @@ func (s *RateLimitPolicyStatus) GetConditions() []metav1.Condition {
 
 var _ kuadrant.Policy = &RateLimitPolicy{}
 var _ kuadrant.Referrer = &RateLimitPolicy{}
-var _ reconcilers.ObjectWithStatus = &RateLimitPolicy{}
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status

diff --git a/pkg/library/reconcilers/base_reconciler.go b/pkg/library/reconcilers/base_reconciler.go
@@ -43,12 +43,6 @@ type StatusMeta struct {
 func (meta *StatusMeta) GetObservedGeneration() int64  { return meta.ObservedGeneration }
 func (meta *StatusMeta) SetObservedGeneration(o int64) { meta.ObservedGeneration = o }
 
-type ObjectWithStatus interface {
-	client.Object
-	GetObservedGeneration() int64
-	SetObservedGeneration(o int64)
-}
-
 // StatusMutator is an interface to hold mutator functions for status updates.
 type StatusMutator interface {
 	Mutate(obj client.Object) (bool, error)
@@ -175,7 +169,7 @@ func (b *BaseReconciler) ReconcileResource(ctx context.Context, obj, desired cli
 	return nil
 }
 
-func (b *BaseReconciler) ReconcileResourceStatus(ctx context.Context, objKey client.ObjectKey, obj ObjectWithStatus, mutator StatusMutator) error {
+func (b *BaseReconciler) ReconcileResourceStatus(ctx context.Context, objKey client.ObjectKey, obj client.Object, mutator StatusMutator) error {
 	logger, err := logr.FromContext(ctx)
 	if err != nil {
 		return err