From 4950d651c991973571b66c9c2dad877fdf32ab44 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Fri, 11 Aug 2017 21:35:52 -0400 Subject: [PATCH 1/3] Add gce annotations Related to creating HTTPS load balancers. --- docs/annotations.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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. From 91e75457c4f1fb16c1856d7c56edb0eebb2ec5b4 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Sat, 12 Aug 2017 02:52:20 -0400 Subject: [PATCH 2/3] make easier to read --- docs/annotations.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docs/annotations.md b/docs/annotations.md index 6a6be9312..662980fcb 100644 --- a/docs/annotations.md +++ b/docs/annotations.md @@ -1,14 +1,17 @@ # Ingress Annotations -This file defines a list of annotations which are supported by various Ingress controllers (both those based on the common ingress code, and alternative implementations). The intention is to ensure the maximum amount of compatibility between different implementations. +This file defines a list of annotations which are supported by various Ingress controllers (both those based on the common ingress code, and alternative implementations). +The intention is to ensure the maximum amount of compatibility between different implementations. -All annotations are assumed to be prefixed with `ingress.kubernetes.io/` except where otherwise specified. There is no attempt to record implementation-specific annotations using other prefixes. (Traefik in particular defines several of its own annotations which are not described here, and does not seem to support any of the standard annotations.) +All annotations are assumed to be prefixed with `ingress.kubernetes.io/` except where otherwise specified. +There is no attempt to record implementation-specific annotations using other prefixes. +(Traefik in particular defines several of its own annotations which are not described here, and does not seem to support any of the standard annotations.) Key: * `nginx`: the `kubernetes/ingress` nginx controller * `gce`: the `kubernetes/ingress` GCE controller -* `traefik`: Traefik's built-in Ingress controller +* `traefik`: Traefik's built-in Ingress controller * `haproxy`: Joao Morais' [HAProxy Ingress controller](https://github.com/jcmoraisjr/haproxy-ingress) * `trafficserver`: Torchbox's [Apache Traffic Server controller plugin](https://github.com/torchbox/k8s-ts-ingress) From 6602b2f0d883bfaec5a42a132b72bf0e2876a7bb Mon Sep 17 00:00:00 2001 From: Tony Li Date: Sat, 12 Aug 2017 03:14:08 -0400 Subject: [PATCH 3/3] fix typo --- docs/annotations.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/annotations.md b/docs/annotations.md index 662980fcb..523154b2f 100644 --- a/docs/annotations.md +++ b/docs/annotations.md @@ -63,7 +63,7 @@ Key: | `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 balanver. (gce) +| `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) [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.