From 75280aad28a9a5cf3fb226ba20df09a50e311b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
 <charles.edouard@nirmata.com>
Date: Mon, 3 Apr 2023 17:17:44 +0200
Subject: [PATCH] fix: quit when loosing leadership (#6718)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
Co-authored-by: shuting <shuting@nirmata.com>
---
 cmd/background-controller/main.go | 11 ++---------
 cmd/cleanup-controller/main.go    | 11 ++---------
 cmd/reports-controller/main.go    | 11 ++---------
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/cmd/background-controller/main.go b/cmd/background-controller/main.go
index 95b653063b..1eb8dc179f 100644
--- a/cmd/background-controller/main.go
+++ b/cmd/background-controller/main.go
@@ -309,13 +309,6 @@ func main() {
 		controller.Run(signalCtx, logger.WithName("controllers"), &wg)
 	}
 	// start leader election
-	for {
-		select {
-		case <-signalCtx.Done():
-			wg.Wait()
-			return
-		default:
-			le.Run(signalCtx)
-		}
-	}
+	le.Run(signalCtx)
+	wg.Wait()
 }
diff --git a/cmd/cleanup-controller/main.go b/cmd/cleanup-controller/main.go
index 3b44727d67..2d0b13eb3e 100644
--- a/cmd/cleanup-controller/main.go
+++ b/cmd/cleanup-controller/main.go
@@ -229,13 +229,6 @@ func main() {
 	)
 	// start server
 	server.Run(ctx.Done())
-	// wait for termination signal and run leader election loop
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-			le.Run(ctx)
-		}
-	}
+	// start leader election
+	le.Run(ctx)
 }
diff --git a/cmd/reports-controller/main.go b/cmd/reports-controller/main.go
index fed67358e7..0a22197c4c 100644
--- a/cmd/reports-controller/main.go
+++ b/cmd/reports-controller/main.go
@@ -415,13 +415,6 @@ func main() {
 	for _, controller := range nonLeaderControllers {
 		controller.Run(ctx, logger.WithName("controllers"), &wg)
 	}
-	for {
-		select {
-		case <-ctx.Done():
-			wg.Wait()
-			return
-		default:
-			le.Run(ctx)
-		}
-	}
+	le.Run(ctx)
+	wg.Wait()
 }