Merge pull request #4586 from aledbf/fix-reload

Fix reload when a configmap changes
This commit is contained in:
Kubernetes Prow Robot 2019-09-24 07:23:28 -07:00 committed by GitHub
commit cb2889b87b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 28 deletions

View file

@ -22,6 +22,7 @@ import (
"strings"
networking "k8s.io/api/networking/v1beta1"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/internal/ingress/errors"
)
@ -130,3 +131,24 @@ func normalizeString(input string) string {
return strings.Join(trimmedContent, "\n")
}
var configmapAnnotations = sets.NewString(
"auth-proxy-set-header",
"fastcgi-params-configmap",
)
// AnnotationsReferencesConfigmap checks if at least one annotation in the Ingress rule
// references a configmap.
func AnnotationsReferencesConfigmap(ing *networking.Ingress) bool {
if ing == nil || len(ing.GetAnnotations()) == 0 {
return false
}
for name := range ing.GetAnnotations() {
if configmapAnnotations.Has(name) {
return true
}
}
return false
}