Fix status reconciler requeue logic: RequeueAfter and skip equal-status write

Two issues in the previous requeue logic:

1. The guard `equalStatus && newAvailable` caused the unavailable-but-equal
   case to fall through to a status write even when nothing had changed,
   producing a no-op write on every reconcile while the instance remained
   unavailable. The new `if equalStatus` guard short-circuits both the
   available and unavailable steady states, avoiding the unnecessary write.

2. Both unavailable return paths used `Requeue: true` (immediate requeue),
   which causes tight-loop reconciliation against an instance that is still
   unavailable. Switching to `RequeueAfter: 30s` gives components time to
   recover between checks and avoids extending backoff counter.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: urbanikb

controllers/apps/apimanager_status_reconciler.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"time"
 
 	appsv1alpha1 "github.com/3scale/3scale-operator/apis/apps/v1alpha1"
 	subController "github.com/3scale/3scale-operator/controllers/subscription"
@@ -49,16 +50,15 @@ func (s *APIManagerStatusReconciler) Reconcile() (reconcile.Result, error) {
 		return reconcile.Result{}, fmt.Errorf("failed to calculate status: %w", err)
 	}
 
-	// Read availability from the newly computed status, not the stale pre-reconcile snapshot.
-	// Using old status caused a True-to-False requeue gap: old=Available=True would suppress
-	// the requeue even after writing Available=False to the API server (THREESCALE-10754).
 	newAvailable := newStatus.Conditions.IsTrueFor(appsv1alpha1.APIManagerAvailableConditionType)
 
 	equalStatus := s.apimanagerResource.Status.Equals(newStatus, s.logger)
 	s.logger.V(1).Info("Status", "status is different", !equalStatus)
-	if equalStatus && newAvailable {
-		// Steady state
+	if equalStatus {
 		s.logger.V(1).Info("Status was not updated")
+		if !newAvailable {
+			return reconcile.Result{RequeueAfter: 30 * time.Second}, nil
+		}
 		return reconcile.Result{}, nil
 	}
 
@@ -75,7 +75,7 @@ func (s *APIManagerStatusReconciler) Reconcile() (reconcile.Result, error) {
 	}
 
 	if !newAvailable {
-		return reconcile.Result{Requeue: true}, nil
+		return reconcile.Result{RequeueAfter: 30 * time.Second}, nil
 	}
 
 	return reconcile.Result{}, nil

controllers/apps/apimanager_status_reconciler_test.go

@@ -609,10 +609,10 @@ func TestAPIManagerStatusReconciler_Reconcile_statusConditions(t *testing.T) {
 	}
 }
 
-// TestAPIManagerStatusReconciler_Reconcile_requeueOnTrueToFalseTransition is a regression
-// test for the stale-read requeue bug: when Available transitions from True to False the
-// reconciler must requeue, not settle silently at Available=False.
-func TestAPIManagerStatusReconciler_Reconcile_requeueOnTrueToFalseTransition(t *testing.T) {
+// TestAPIManagerStatusReconciler_Reconcile_requeueAfterWhenUnavailable verifies that when
+// Available transitions from True to False the reconciler schedules a requeue rather than
+// settling silently at Available=False.
+func TestAPIManagerStatusReconciler_Reconcile_requeueAfterWhenUnavailable(t *testing.T) {
 	namespace := "test-namespace"
 	t.Setenv("PREFLIGHT_CHECKS_BYPASS", "true")
 
@@ -640,7 +640,7 @@ func TestAPIManagerStatusReconciler_Reconcile_requeueOnTrueToFalseTransition(t *
 	if err != nil {
 		t.Fatalf("Reconcile() unexpected error: %v", err)
 	}
-	if !result.Requeue {
-		t.Errorf("Reconcile() Requeue = false, want true on Available True-to-False transition")
+	if result.RequeueAfter == 0 {
+		t.Errorf("Reconcile() RequeueAfter = 0, want non-zero on Available True-to-False transition")
 	}
 }