Merge pull request #6150 from timmysilv/master

Reject ingresses that use the default annotation if a custom one was provided
This commit is contained in:
Kubernetes Prow Robot 2020-09-10 07:11:45 -07:00 committed by GitHub
commit 91c6d1a081
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 3 deletions

View file

@ -28,9 +28,12 @@ import (
"k8s.io/ingress-nginx/internal/ingress/errors"
)
// DefaultAnnotationsPrefix defines the common prefix used in the nginx ingress controller
const DefaultAnnotationsPrefix = "nginx.ingress.kubernetes.io"
var (
// AnnotationsPrefix defines the common prefix used in the nginx ingress controller
AnnotationsPrefix = "nginx.ingress.kubernetes.io"
// AnnotationsPrefix is the mutable attribute that the controller explicitly refers to
AnnotationsPrefix = DefaultAnnotationsPrefix
)
// IngressAnnotation has a method to parse annotations located in Ingress