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

Accept ns/name Secret reference in annotations

Browse source
This commit is contained in:
Antoine Cotten 2018-04-20 00:05:54 +02:00
parent c3ff76ae50
commit 0e8ac3077a
No known key found for this signature in database
GPG key ID: EA06C9A94E2B3EA0
2 changed files with 110 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -538,12 +538,12 @@ func (s *k8sStore) updateSecretIngressMap(ing *extensions.Ingress) {
"auth-tls-secret",
}
for _, ann := range secretAnnotations {
secrName, err := parser.GetStringAnnotation(ann, ing)
secrKey, err := objectRefAnnotationNsKey(ann, ing)
if err != nil {
glog.Errorf("error reading secret reference in annotation %q: %s", ann, err)
continue
}
if secrName != "" {
secrKey := fmt.Sprintf("%v/%v", ing.Namespace, secrName)
if secrKey != "" {
refSecrets = append(refSecrets, secrKey)
}
}
@ -552,6 +552,25 @@ func (s *k8sStore) updateSecretIngressMap(ing *extensions.Ingress) {
s.secretIngressMap.Insert(key, refSecrets...)
}
// objectRefAnnotationNsKey returns an object reference formatted as a
// 'namespace/name' key from the given annotation name.
func objectRefAnnotationNsKey(ann string, ing *extensions.Ingress) (string, error) {
annValue, err := parser.GetStringAnnotation(ann, ing)
if annValue == "" {
return "", err
}
secrNs, secrName, err := cache.SplitMetaNamespaceKey(annValue)
if secrName == "" {
return "", err
}
if secrNs == "" {
return fmt.Sprintf("%v/%v", ing.Namespace, secrName), nil
}
return annValue, nil
}
// syncSecrets synchronizes data from all Secrets referenced by the given
// Ingress with the local store and file system.
func (s k8sStore) syncSecrets(ing *extensions.Ingress) {