diff --git a/docs/annotations.md b/docs/annotations.md index 54bbdfa1a..6a6be9312 100644 --- a/docs/annotations.md +++ b/docs/annotations.md @@ -21,6 +21,7 @@ Key: | `force-ssl-redirect` | Redirect non-TLS requests to TLS even when TLS is not configured. Default `false`. (nginx, trafficserver). | `secure-backends` | Use TLS to communicate with origin (pods). Default `false`. (nginx, haproxy, trafficserver) | `kubernetes.io/ingress.allow-http` | Whether to accept non-TLS HTTP connections. (gce) +| `pre-shared-cert` | Name of the TLS certificate in GCP to use when provisioning the HTTPS load balancer. (gce) | `hsts-max-age` | Set an HSTS header with this lifetime. (trafficserver) | `hsts-include-subdomains` | Add includeSubdomains to the HSTS header. (trafficserver) @@ -58,7 +59,8 @@ Key: | `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) +| `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 balanver. (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.