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

Include missing secrets in secretIngressMap

Browse source 
Update secretIngressMap independently from stored annotations, which may
miss some secret references.
This commit is contained in:
Antoine Cotten 2018-04-13 10:44:34 +02:00
parent fec3ddc6cc
commit c786f55336
No known key found for this signature in database
GPG key ID: EA06C9A94E2B3EA0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -352,7 +352,6 @@ func New(checkOCSP bool,
continue continue
} }
store.extractAnnotations(ing) store.extractAnnotations(ing)
store.updateSecretIngressMap(ing)
store.syncSecrets(ing) store.syncSecrets(ing)
} }
updateCh.In() <- Event{ updateCh.In() <- Event{
@ -380,7 +379,6 @@ func New(checkOCSP bool,
continue continue
} }
store.extractAnnotations(ing) store.extractAnnotations(ing)
store.updateSecretIngressMap(ing)
store.syncSecrets(ing) store.syncSecrets(ing)
} }
updateCh.In() <- Event{ updateCh.In() <- Event{
@ -420,7 +418,6 @@ func New(checkOCSP bool,
continue continue
} }
store.extractAnnotations(ing) store.extractAnnotations(ing)
store.updateSecretIngressMap(ing)
} }
updateCh.In() <- Event{ updateCh.In() <- Event{
Type: DeleteEvent, Type: DeleteEvent,
@ -533,18 +530,19 @@ func (s *k8sStore) updateSecretIngressMap(ing *extensions.Ingress) {
} }
} }
anns, err := s.GetIngressAnnotations(ing) // We can not rely on cached ingress annotations because these are
if err != nil { // discarded when the referenced secret does not exist in the local
glog.Errorf("Error reading Ingress annotations: %v", err) // store. As a result, adding a secret *after* the ingress(es) which
return // references it would not trigger a resync of that secret.
}
secretAnnotations := []string{ secretAnnotations := []string{
anns.BasicDigestAuth.Secret, "auth-secret",
anns.CertificateAuth.Secret, "auth-tls-secret",
} }
for _, ann := range secretAnnotations {
for _, secrName := range secretAnnotations { secrName, err := parser.GetStringAnnotation(ann, ing)
if err != nil {
continue
}
if secrName != "" { if secrName != "" {
secrKey := fmt.Sprintf("%v/%v", ing.Namespace, secrName) secrKey := fmt.Sprintf("%v/%v", ing.Namespace, secrName)
refSecrets = append(refSecrets, secrKey) refSecrets = append(refSecrets, secrKey)