Create stop channel on new manager

Author: JoelSpeed

pkg/manager/internal.go

@@ -73,7 +73,7 @@ type controllerManager struct {
 	mu      sync.Mutex
 	started bool
 	errChan chan error
-	stop    <-chan struct{}
+	stop    chan struct{}
 
 	startCache func(stop <-chan struct{}) error
 }
@@ -162,7 +162,8 @@ func (cm *controllerManager) Start(stop <-chan struct{}) error {
 		go cm.start(stop)
 		select {
 		case <-stop:
-			// we are done
+			// We are done, close the internal stop channel
+			close(cm.stop)
 			return nil
 		case err := <-cm.errChan:
 			// Error starting a controller
@@ -195,7 +196,8 @@ func (cm *controllerManager) Start(stop <-chan struct{}) error {
 
 	select {
 	case <-stop:
-		// We are done
+		// We are done, close the internal stop channel
+		close(cm.stop)
 		return nil
 	case err := <-cm.errChan:
 		// Error starting a controller
@@ -208,8 +210,6 @@ func (cm *controllerManager) start(stop <-chan struct{}) {
 		cm.mu.Lock()
 		defer cm.mu.Unlock()
 
-		cm.stop = stop
-
 		// Start the Cache. Allow the function to start the cache to be mocked out for testing
 		if cm.startCache == nil {
 			cm.startCache = cm.cache.Start

pkg/manager/manager.go

@@ -180,6 +180,8 @@ func New(config *rest.Config, options Options) (Manager, error) {
 		return nil, err
 	}
 
+	stop := make(chan struct{})
+
 	return &controllerManager{
 		config:           config,
 		scheme:           options.Scheme,
@@ -191,6 +193,7 @@ func New(config *rest.Config, options Options) (Manager, error) {
 		recorderProvider: recorderProvider,
 		resourceLock:     resourceLock,
 		mapper:           mapper,
+		stop:             stop,
 	}, nil
 }
 

pkg/manager/manager_test.go

@@ -164,6 +164,37 @@ var _ = Describe("manger.Manager", func() {
 				close(done)
 			})
 
+			It("should stop the internal when stop is called", func(done Done) {
+				m, err := New(cfg, options)
+				Expect(err).NotTo(HaveOccurred())
+				s := make(chan struct{})
+				close(s)
+				Expect(m.Start(s)).NotTo(HaveOccurred())
+
+				mgr, ok := m.(*controllerManager)
+				Expect(ok).To(BeTrue())
+				Expect(mgr.stop).To(BeClosed())
+				close(done)
+			})
+
+			It("should not overwrite the internal stop channel", func(done Done) {
+				m, err := New(cfg, options)
+				Expect(err).NotTo(HaveOccurred())
+				s := make(chan struct{})
+
+				go func() {
+					defer GinkgoRecover()
+					Expect(m.Start(s)).NotTo(HaveOccurred())
+					close(done)
+				}()
+
+				mgr, ok := m.(*controllerManager)
+				Expect(ok).To(BeTrue())
+				Expect(mgr.stop).ToNot(Equal(stop))
+
+				close(s)
+			})
+
 			It("should return an error if it can't start the cache", func(done Done) {
 				m, err := New(cfg, options)
 				Expect(err).NotTo(HaveOccurred())
@@ -327,8 +358,7 @@ var _ = Describe("manger.Manager", func() {
 				},
 				stop: func(stop <-chan struct{}) error {
 					defer GinkgoRecover()
-					// Manager stop chan has not been initialized.
-					Expect(stop).To(BeNil())
+					Expect(stop).ToNot(BeNil())
 					return nil
 				},
 				f: func(f inject.Func) error {