From ed4f099f8fa94ff86295e4db3ad4bb3fd7b70576 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Sat, 12 Aug 2017 03:09:42 -0400 Subject: [PATCH] update misc table --- docs/annotations.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/annotations.md b/docs/annotations.md index 22aa5f2f6..24651437f 100644 --- a/docs/annotations.md +++ b/docs/annotations.md @@ -51,19 +51,19 @@ Key: ## Miscellaneous -| Name | Meaning -| --- | --- -| `configuration-snippet` | Arbitrary text to put in the generated configuration file. (nginx) -| `enable-cors` | Enable CORS headers in response. (nginx) -| `limit-connections` | Limit concurrent connections per IP address[1]. (nginx) -| `limit-rps` | Limit requests per second per IP address[1]. (nginx) -| `limit-rpm` | Limit requests per minute per IP address. (nginx) -| `affinity` | Specify a method to stick clients to origins across requests. Found in `nginx`, where the only supported value is `cookie`. (nginx) -| `session-cookie-name` | When `affinity` is set to `cookie`, the name of the cookie to use. (nginx) -| `session-cookie-hash` | When `affinity` is set to `cookie`, the hash algorithm used: `md5`, `sha`, `index`. (nginx) -| `proxy-body-size` | Maximum request body size. (nginx, haproxy) -| `follow-redirects` | Follow HTTP redirects in the response and deliver the redirect target to the client. (trafficserver) -| `kubernetes.io/ingress.global-static-ip-name` | Name of the static global IP address in GCP to use when provisioning the HTTPS load balancer. (gce) +| Name | Meaning | Default | Controller +| --- | --- | --- | --- | +| `configuration-snippet` | Arbitrary text to put in the generated configuration file. | | nginx +| `enable-cors` | Enable CORS headers in response. | | nginx +| `limit-connections` | Limit concurrent connections per IP address[1]. | | nginx +| `limit-rps` | Limit requests per second per IP address[1]. | | nginx +| `limit-rpm` | Limit requests per minute per IP address. | | nginx +| `affinity` | Specify a method to stick clients to origins across requests. Found in `nginx`, where the only supported value is `cookie`. | | nginx +| `session-cookie-name` | When `affinity` is set to `cookie`, the name of the cookie to use. | | nginx +| `session-cookie-hash` | When `affinity` is set to `cookie`, the hash algorithm used: `md5`, `sha`, `index`. | | nginx +| `proxy-body-size` | Maximum request body size. | | nginx, haproxy +| `follow-redirects` | Follow HTTP redirects in the response and deliver the redirect target to the client. | | trafficserver +| `kubernetes.io/ingress.global-static-ip-name` | Name of the static global IP address in GCP to use when provisioning the HTTPS load balancer. | empty string | gce [1] The documentation for the `nginx` controller says that only one of `limit-connections` or `limit-rps` may be specified; it's not clear why this is.