From 67487042bd0b6ed117451bf001a07546ab16b44c Mon Sep 17 00:00:00 2001
From: Morten Zwarenstein <Morten.Zwarenstein@kadaster.nl>
Date: Thu, 20 Aug 2026 10:50:58 +0200
Subject: [PATCH] feat: move cleanup to assure newer resources are created
 already

---
 internal/controller/volume_controller.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/internal/controller/volume_controller.go b/internal/controller/volume_controller.go
index e5bbf48..618351e 100644
--- a/internal/controller/volume_controller.go
+++ b/internal/controller/volume_controller.go
@@ -71,12 +71,6 @@ func (r *VolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, nil
 	}
 
-	err = cleanUpOldReplicaSets(ctx, r.Client, &rs, deployment, conf)
-
-	if err != nil {
-		return ctrl.Result{}, client.IgnoreNotFound(err)
-	}
-
 	if !conf.RevisionsMatch() {
 		logger.Info(
 			"Revision mismatch, skipping reconciliation",
@@ -105,6 +99,11 @@ func (r *VolumeReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 		return ctrl.Result{}, err
 	}
 
+	err = cleanUpOldReplicaSets(ctx, r.Client, &rs, deployment, conf)
+	if err != nil {
+		return ctrl.Result{}, client.IgnoreNotFound(err)
+	}
+
 	return ctrl.Result{}, err
 }