From 4811168d2a6a7b421bb84159b67bdc15c7c129f9 Mon Sep 17 00:00:00 2001 From: okryvoshapka-connyun Date: Mon, 6 May 2019 09:04:12 +0200 Subject: [PATCH] Fixed typos --- docs/user-guide/nginx-configuration/annotations.md | 2 +- internal/ingress/controller/config/config.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/nginx-configuration/annotations.md b/docs/user-guide/nginx-configuration/annotations.md index 61a0d4fdb..830ab4f77 100755 --- a/docs/user-guide/nginx-configuration/annotations.md +++ b/docs/user-guide/nginx-configuration/annotations.md @@ -392,7 +392,7 @@ nginx.ingress.kubernetes.io/auth-snippet: | #### Global External Authentication -By default the controller redirects all requests to an existing service that provides authentication if `global-auth-url` is set in the NGINX ConfigMap. If you want to disable this behavior for that ingress, you can use ssl-redirect: "false" in the NGINX ConfigMap. +By default the controller redirects all requests to an existing service that provides authentication if `global-auth-url` is set in the NGINX ConfigMap. If you want to disable this behavior for that ingress, you can use `enable-global-auth: "false"` in the NGINX ConfigMap. `nginx.ingress.kubernetes.io/enable-global-auth`: indicates if GlobalExternalAuth configuration should be applied or not to this Ingress rule. Default values is set to `"true"`. diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go index 9ca6152e6..f06856406 100755 --- a/internal/ingress/controller/config/config.go +++ b/internal/ingress/controller/config/config.go @@ -603,7 +603,7 @@ func NewDefault() Configuration { defNginxStatusIpv4Whitelist = append(defNginxStatusIpv4Whitelist, "127.0.0.1") defNginxStatusIpv6Whitelist = append(defNginxStatusIpv6Whitelist, "::1") defProxyDeadlineDuration := time.Duration(5) * time.Second - degGlobalExternalAuth := GlobalExternalAuth{"", "", "", "", append(defResponseHeaders, ""), "", ""} + defGlobalExternalAuth := GlobalExternalAuth{"", "", "", "", append(defResponseHeaders, ""), "", ""} cfg := Configuration{ AllowBackendServerHeader: false, @@ -722,7 +722,7 @@ func NewDefault() Configuration { SyslogPort: 514, NoTLSRedirectLocations: "/.well-known/acme-challenge", NoAuthLocations: "/.well-known/acme-challenge", - GlobalExternalAuth: degGlobalExternalAuth, + GlobalExternalAuth: defGlobalExternalAuth, } if klog.V(5) {