From 2a02b7c35cfd973d7289880f2368df0bae8a258a Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Fri, 6 Apr 2018 17:44:41 -0300
Subject: [PATCH] Fix race condition when Ingress does not contains a secret
 (#2300)

---
 internal/ingress/controller/store/store.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go
index 9d57a9e2b..c83e71a7c 100644
--- a/internal/ingress/controller/store/store.go
+++ b/internal/ingress/controller/store/store.go
@@ -347,7 +347,9 @@ func New(checkOCSP bool,
 
 					for _, name := range set.List() {
 						ing, _ := store.GetIngress(name)
-						store.extractAnnotations(ing)
+						if ing != nil {
+							store.extractAnnotations(ing)
+						}
 					}
 
 					updateCh.In() <- Event{
@@ -479,7 +481,7 @@ func (s *k8sStore) extractAnnotations(ing *extensions.Ingress) {
 	secName := anns.BasicDigestAuth.Secret
 	if secName != "" {
 		if _, ok := s.secretIngressMap[secName]; !ok {
-			s.secretIngressMap[secName] = sets.NewString()
+			s.secretIngressMap[secName] = sets.String{}
 		}
 		v := s.secretIngressMap[secName]
 		if !v.Has(key) {
@@ -490,7 +492,7 @@ func (s *k8sStore) extractAnnotations(ing *extensions.Ingress) {
 	secName = anns.CertificateAuth.Secret
 	if secName != "" {
 		if _, ok := s.secretIngressMap[secName]; !ok {
-			s.secretIngressMap[secName] = sets.NewString()
+			s.secretIngressMap[secName] = sets.String{}
 		}
 		v := s.secretIngressMap[secName]
 		if !v.Has(key) {