From fc484777954f97185519e0c392a169715f8c7ea9 Mon Sep 17 00:00:00 2001
From: "Dr. Stefan Schimanski" <stefan.schimanski@gmail.com>
Date: Wed, 24 Apr 2024 12:05:20 +0200
Subject: [PATCH] SQUASH: better disengage error behaviour

Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>
---
 pkg/controller/multicluster.go | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkg/controller/multicluster.go b/pkg/controller/multicluster.go
index 078834f9e3..d57b50dea6 100644
--- a/pkg/controller/multicluster.go
+++ b/pkg/controller/multicluster.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"sync"
 
+	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"sigs.k8s.io/controller-runtime/pkg/cluster"
 )
 
@@ -64,22 +65,33 @@ func (c *multiClusterController) Engage(clusterCtx context.Context, cl cluster.C
 		return nil
 	}
 
+	engaged := make([]cluster.Aware, 0, len(c.awares)+1)
+	disengage := func() error {
+		var errs []error
+		for _, aware := range engaged {
+			if err := aware.Disengage(clusterCtx, cl); err != nil {
+				errs = append(errs, err)
+			}
+		}
+		return kerrors.NewAggregate(errs)
+	}
+
 	// pass through in case the controller itself is cluster aware
 	if ctrl, ok := c.Controller.(cluster.Aware); ok {
 		if err := ctrl.Engage(clusterCtx, cl); err != nil {
 			return err
 		}
+		engaged = append(engaged, ctrl)
 	}
 
 	// start watches on the cluster
 	if err := c.watcher.Watch(clusterCtx, cl); err != nil {
-		if ctrl, ok := c.Controller.(cluster.AwareRunnable); ok {
-			if err := ctrl.Disengage(clusterCtx, cl); err != nil {
-				return err
-			}
+		if err := disengage(); err != nil {
+			return err
 		}
 		return err
 	}
+
 	c.clusters[cl.Name()] = struct{}{}
 
 	return nil
@@ -96,11 +108,12 @@ func (c *multiClusterController) Disengage(ctx context.Context, cl cluster.Clust
 	delete(c.clusters, cl.Name())
 
 	// pass through in case the controller itself is cluster aware
-	if ctrl, ok := c.Controller.(cluster.AwareRunnable); ok {
+	var errs []error
+	if ctrl, ok := c.Controller.(cluster.Aware); ok {
 		if err := ctrl.Disengage(ctx, cl); err != nil {
-			return err
+			errs = append(errs, err)
 		}
 	}
 
-	return nil
+	return kerrors.NewAggregate(errs)
 }