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

Merge pull request #3822 from Shopify/satisfy-default-remove

Browse source 
Set default for satisfy annotation to nothing
This commit is contained in:
Kubernetes Prow Robot 2019-02-27 06:13:06 -08:00 committed by GitHub
commit a1b2e132e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/ingress/annotations/satisfy/main.go
View file

@ -35,8 +35,9 @@ func NewParser(r resolver.Resolver) parser.IngressAnnotation {
// Parse parses annotation contained in the ingress // Parse parses annotation contained in the ingress
func (s satisfy) Parse(ing *extensions.Ingress) (interface{}, error) { func (s satisfy) Parse(ing *extensions.Ingress) (interface{}, error) {
satisfy, err := parser.GetStringAnnotation("satisfy", ing) satisfy, err := parser.GetStringAnnotation("satisfy", ing)
if err != nil || satisfy != "any" {
satisfy = "all" if err != nil || (satisfy != "any" && satisfy != "all") {
satisfy = ""
} }
return satisfy, nil return satisfy, nil

3
internal/ingress/annotations/satisfy/main_test.go
View file

@ -69,7 +69,8 @@ func TestSatisfyParser(t *testing.T) {
data := map[string]string{ data := map[string]string{
"any": "any", "any": "any",
"all": "all", "all": "all",
"invalid": "all", "invalid": "",
"": "",
} }
annotations := map[string]string{} annotations := map[string]string{}

10
test/e2e/annotations/satisfy.go
View file

@ -43,15 +43,13 @@ var _ = framework.IngressNginxDescribe("Annotations - SATISFY", func() {
annotationKey := "nginx.ingress.kubernetes.io/satisfy" annotationKey := "nginx.ingress.kubernetes.io/satisfy"
annotations := map[string]string{ annotations := map[string]string{
"any": "any", "any": "any",
"all": "all", "all": "all",
"invalid": "all",
} }
results := map[string]string{ results := map[string]string{
"any": "satisfy any", "any": "satisfy any",
"all": "satisfy all", "all": "satisfy all",
"invalid": "satisfy all",
} }
initAnnotations := map[string]string{ initAnnotations := map[string]string{