Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/client-body-buffer-size: 10m
nginx.ingress.kubernetes.io/proxy-buffering: "on"
nginx.ingress.kubernetes.io/limit-rpm: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "30s"
nginx.ingress.kubernetes.io/proxy-read-timeout: "45s"
Expand All @@ -29,6 +30,7 @@ kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/client-body-buffer-size: 20m
nginx.ingress.kubernetes.io/proxy-buffering: "on"
nginx.ingress.kubernetes.io/limit-rps: "10"
nginx.ingress.kubernetes.io/proxy-send-timeout: "60" # No "s" suffix, should still be parsed correctly
nginx.ingress.kubernetes.io/proxy-read-timeout: "60" # No "s" suffix, should still be parsed correctly
Expand All @@ -54,9 +56,10 @@ kind: Ingress
metadata:
annotations:
nginx.ingress.kubernetes.io/client-body-buffer-size: 40m
nginx.ingress.kubernetes.io/proxy-body-size: "100m"
nginx.ingress.kubernetes.io/proxy-buffering: "on"
nginx.ingress.kubernetes.io/limit-rps: "50"
nginx.ingress.kubernetes.io/limit-burst-multiplier: "5"
nginx.ingress.kubernetes.io/proxy-body-size: "100m"
nginx.ingress.kubernetes.io/proxy-send-timeout: "90s"
nginx.ingress.kubernetes.io/proxy-read-timeout: "90s"
nginx.ingress.kubernetes.io/proxy-connect-timeout: "120"
Expand Down
12 changes: 11 additions & 1 deletion pkg/i2gw/providers/ingressnginx/bodybuffer.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
)

const clientBodyBufferSizeAnnotation = "nginx.ingress.kubernetes.io/client-body-buffer-size"
const (
clientBodyBufferSizeAnnotation = "nginx.ingress.kubernetes.io/client-body-buffer-size"
proxyBufferingAnnotation = "nginx.ingress.kubernetes.io/proxy-buffering"
)
Comment on lines +30 to +33

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I closed #64 as an invalid bug, so please remove commit 5640e87 from this PR.


// bufferPolicyFeature parses the "nginx.ingress.kubernetes.io/client-body-buffer-size" annotation
// from Ingresses and records them as generic Policies in the ingress-nginx provider-specific IR.
Expand All @@ -48,6 +51,13 @@ func bufferPolicyFeature(
continue
}

// Skip buffer size annotations when proxy-buffering is disabled or unset.
// Buffering is disabled by default in NGINX ingress controller.
bufferingEnabled := ing.Annotations[proxyBufferingAnnotation]
if bufferingEnabled != "on" {
continue
}

q, err := resource.ParseQuantity(val)
if err != nil {
errList = append(errList, field.Invalid(
Expand Down
Loading