Add watchFactory waitgroup

Add waitgroup property to watchFactory

Use the waitgroup to ensure that we block shutdown until the retry loop
is done

Signed-off-by: Ben Pickard <bpickard@redhat.com>

go-controller/pkg/factory/factory.go

@@ -3,6 +3,7 @@ package factory
 import (
 	"fmt"
 	"reflect"
+	"sync"
 	"sync/atomic"
 	"time"
 
@@ -60,6 +61,7 @@ type WatchFactory struct {
 	informers        map[reflect.Type]*informer
 
 	stopChan chan struct{}
+	wg       sync.WaitGroup
 }
 
 // WatchFactory implements the ObjectCacheInterface interface.
@@ -347,8 +349,10 @@ func NewNodeWatchFactory(ovnClientset *util.OVNClientset, nodeName string) (*Wat
 }
 
 func (wf *WatchFactory) WaitForWatchFactoryStopChannel(stopChan chan struct{}) {
+	wf.wg.Add(1)
 	<-wf.stopChan
 	close(stopChan)
+	wf.wg.Done()
 }
 
 func (wf *WatchFactory) Shutdown() {
@@ -358,6 +362,8 @@ func (wf *WatchFactory) Shutdown() {
 	for _, inf := range wf.informers {
 		inf.shutdown()
 	}
+
+	wf.wg.Wait()
 }
 
 func getObjectMeta(objType reflect.Type, obj interface{}) (*metav1.ObjectMeta, error) {