refactor and clean up

Author: CMGS

cocoonset/reconciler.go

@@ -1,6 +1,7 @@
 package cocoonset
 
 import (
+	"cmp"
 	"context"
 	"fmt"
 	"maps"
@@ -332,22 +333,35 @@ func (r *Reconciler) applySuspend(ctx context.Context, classified classifiedPods
 // CocoonHibernation status would still read Hibernated, and the user
 // would observe a phantom-running pod.
 //
-// The cheap path (no in-flight CRs in the namespace) only walks the
-// owned pods and skips ones whose hibernate annotation is already
-// absent — PatchHibernateState(false) is a no-op there.
+// Fast path: the steady-state non-suspended CocoonSet has no pod
+// carrying the hibernate annotation, so we skip the CocoonHibernation
+// List entirely. One pass over classified.allByName collects the
+// hibernated subset; if it's empty we return without touching the
+// API. Otherwise we sort just that subset (for deterministic patch
+// order under test) and consult the CR list to decide which ones to
+// leave alone.
 func (r *Reconciler) applyUnsuspend(ctx context.Context, namespace string, classified classifiedPods) error {
+	var hibernated []*corev1.Pod
+	for _, pod := range classified.allByName {
+		if bool(meta.ReadHibernateState(pod)) {
+			hibernated = append(hibernated, pod)
+		}
+	}
+	if len(hibernated) == 0 {
+		return nil
+	}
+	slices.SortFunc(hibernated, func(a, b *corev1.Pod) int {
+		return cmp.Compare(a.Name, b.Name)
+	})
+
 	hibernatedByCR, err := r.podsHibernatedByCR(ctx, namespace)
 	if err != nil {
 		return err
 	}
-	for _, name := range slices.Sorted(maps.Keys(classified.allByName)) {
+	for _, pod := range hibernated {
 		if ctxErr := ctx.Err(); ctxErr != nil {
 			return ctxErr
 		}
-		pod := classified.allByName[name]
-		if !bool(meta.ReadHibernateState(pod)) {
-			continue
-		}
 		if _, ownedByCR := hibernatedByCR[pod.Name]; ownedByCR {
 			continue
 		}

go.mod

@@ -5,6 +5,7 @@ go 1.25.0
 require (
 	github.com/cocoonstack/cocoon-common v0.1.4-0.20260411114436-0cf2e26e5798
 	github.com/cocoonstack/epoch v0.1.8-0.20260411050236-353f65a833f9
+	github.com/go-logr/logr v1.4.3
 	github.com/projecteru2/core v0.0.0-20241016125006-ff909eefe04c
 	k8s.io/api v0.35.3
 	k8s.io/apimachinery v0.35.3
@@ -25,7 +26,6 @@ require (
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/getsentry/sentry-go v0.20.0 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-openapi/jsonpointer v0.21.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.23.0 // indirect