TEST: add CORS configmap e2e tests

haproxytech · Apr 22, 2022 · 2865276 · 2865276
1 parent 4256f32
commit 2865276
Show file tree

Hide file tree

Showing 6 changed files with 246 additions and 89 deletions.
diff --git a/controller/annotations/ingress/resSetCORS.go b/controller/annotations/ingress/resSetCORS.go
@@ -135,7 +135,7 @@ func (a ResSetCORSAnn) Process(k store.K8s, annotations ...map[string]string) (e
 			Cond:      "if",
 		})
 	case "cors-allow-credentials":
-		if a.parent.acl == "" {
+		if a.parent.acl == "" || input != "true" {
 			return
 		}
 		a.parent.rules.Add(&rules.SetHdr{

diff --git a/deploy/tests/e2e/cors/config/configmap.yaml.tmpl b/deploy/tests/e2e/cors/config/configmap.yaml.tmpl
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: haproxy-kubernetes-ingress
+ namespace: haproxy-controller
+data:
+{{range .ConfigMapAnnotations}}
+  {{ .Key }}: {{ .Value }}
+{{end}}
+  global-config-snippet: |
+    stats socket 0.0.0.0:31024
+  syslog-server: |
+    address: stdout, format: raw, facility:daemon
+  maxconn: "1000"
+  server-slots: "4"
+  timeout-client: 50s
+  timeout-connect: 5s
+  timeout-http-keep-alive: 1m
+  timeout-http-request: 5s
+  timeout-queue: 5s
+  timeout-server: 50s
+  timeout-tunnel: 1h
diff --git a/deploy/tests/e2e/cors/config/patternfile-a.yml b/deploy/tests/e2e/cors/config/patternfile-a.yml
diff --git a/deploy/tests/e2e/cors/config/patternfile-empty.yml b/deploy/tests/e2e/cors/config/patternfile-empty.yml