prevent nil pointer when starting controllers before running the shar…

…ed informer
lavalamp · May 16, 2016 · 4af1c54 · 4af1c54
1 parent 8d90427
commit 4af1c54
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/controller/framework/shared_informer.go b/pkg/controller/framework/shared_informer.go
@@ -139,11 +139,12 @@ func (s *sharedIndexInformer) Run(stopCh <-chan struct{}) {
 
 		Process: s.HandleDeltas,
 	}
-	s.controller = New(cfg)
 
 	func() {
 		s.startedLock.Lock()
 		defer s.startedLock.Unlock()
+
+		s.controller = New(cfg)
 		s.started = true
 	}()
 
@@ -158,6 +159,12 @@ func (s *sharedIndexInformer) isStarted() bool {
 }
 
 func (s *sharedIndexInformer) HasSynced() bool {
+	s.startedLock.Lock()
+	defer s.startedLock.Unlock()
+
+	if s.controller == nil {
+		return false
+	}
 	return s.controller.HasSynced()
 }