From 60a3e9c1aafe7e8cfc9a5f0362863df59303d7e5 Mon Sep 17 00:00:00 2001
From: Stefan Bueringer <buringerst@vmware.com>
Date: Tue, 12 Oct 2021 10:40:52 +0200
Subject: [PATCH] start healhprobes sync

---
 pkg/manager/internal.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go
index fd4daf46e4..d0f71b3ccc 100644
--- a/pkg/manager/internal.go
+++ b/pkg/manager/internal.go
@@ -425,11 +425,13 @@ func (cm *controllerManager) serveHealthProbes() {
 		cm.healthzStarted = true
 	}()
 
-	// Shutdown the server when stop is closed
-	<-cm.internalProceduresStop
-	if err := server.Shutdown(cm.shutdownCtx); err != nil {
-		cm.errChan <- err
-	}
+	go func() {
+		// Shutdown the server when stop is closed
+		<-cm.internalProceduresStop
+		if err := server.Shutdown(cm.shutdownCtx); err != nil {
+			cm.errChan <- err
+		}
+	}()
 }
 
 func (cm *controllerManager) Start(ctx context.Context) (err error) {
@@ -473,7 +475,7 @@ func (cm *controllerManager) Start(ctx context.Context) (err error) {
 
 	// Serve health probes
 	if cm.healthProbeListener != nil {
-		go cm.serveHealthProbes()
+		cm.serveHealthProbes()
 	}
 
 	// Webhooks MUST start before any cache is populated, otherwise there is a race condition