From 74d57c950282484885a74c92d3413110e3b95c69 Mon Sep 17 00:00:00 2001 From: Jakob Jarosch Date: Fri, 3 Mar 2017 20:29:43 +0100 Subject: [PATCH] Add documentation for ingress.kubernetes.io/force-ssl-redirect refs #314 #365 --- controllers/nginx/configuration.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/controllers/nginx/configuration.md b/controllers/nginx/configuration.md index 5885f587b..e7d4c98f6 100644 --- a/controllers/nginx/configuration.md +++ b/controllers/nginx/configuration.md @@ -40,6 +40,7 @@ The following annotations are supported: |Name |type| |---------------------------|------| |[ingress.kubernetes.io/add-base-url](#rewrite)|true or false| +|[ingress.kubernetes.io/affinity](#session-affinity)|true or false| |[ingress.kubernetes.io/auth-realm](#authentication)|string| |[ingress.kubernetes.io/auth-secret](#authentication)|string| |[ingress.kubernetes.io/auth-type](#authentication)|basic or digest| @@ -47,18 +48,18 @@ The following annotations are supported: |[ingress.kubernetes.io/auth-tls-secret](#Certificate Authentication)|string| |[ingress.kubernetes.io/auth-tls-verify-depth](#Certificate Authentication)|number| |[ingress.kubernetes.io/enable-cors](#enable-cors)|true or false| +|[ingress.kubernetes.io/force-ssl-redirect](#server-side-https-enforcement-through-redirect)|true or false| |[ingress.kubernetes.io/limit-connections](#rate-limiting)|number| |[ingress.kubernetes.io/limit-rps](#rate-limiting)|number| |[ingress.kubernetes.io/proxy-body-size](#custom-max-body-size)|string| |[ingress.kubernetes.io/rewrite-target](#rewrite)|URI| |[ingress.kubernetes.io/secure-backends](#secure-backends)|true or false| +|[ingress.kubernetes.io/session-cookie-name](#cookie-affinity)|string| +|[ingress.kubernetes.io/session-cookie-hash](#cookie-affinity)|string| |[ingress.kubernetes.io/ssl-redirect](#server-side-https-enforcement-through-redirect)|true or false| |[ingress.kubernetes.io/upstream-max-fails](#custom-nginx-upstream-checks)|number| |[ingress.kubernetes.io/upstream-fail-timeout](#custom-nginx-upstream-checks)|number| |[ingress.kubernetes.io/whitelist-source-range](#whitelist-source-range)|CIDR| -|[ingress.kubernetes.io/affinity](#session-affinity)|true or false| -|[ingress.kubernetes.io/session-cookie-name](#cookie-affinity)|string| -|[ingress.kubernetes.io/session-cookie-hash](#cookie-affinity)|string| @@ -198,6 +199,8 @@ By default the controller redirects (301) to `HTTPS` if TLS is enabled for that To configure this feature for specific ingress resources, you can use the `ingress.kubernetes.io/ssl-redirect: "false"` annotation in the particular resource. +When using SSL offloading outside of cluster (e.g. AWS ELB) it may be usefull to enforce a redirect to `HTTPS` even when there is not TLS cert available. This can be achieved by using the `ingress.kubernetes.io/force-ssl-redirect: "true"` annotation in the particular resource. + ### Whitelist source range