DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix race condition when Ingress does not contains a secret (#2300)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-04-06 17:44:41 -03:00 committed by GitHub
parent ab8349008a
commit 2a02b7c35c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal/ingress/controller/store/store.go
View file

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