From adc128711bfde7962d9dc65aceb3ee700a836990 Mon Sep 17 00:00:00 2001
From: Elvin Efendi <elvin.efendiyev@gmail.com>
Date: Wed, 13 Feb 2019 22:41:02 -0500
Subject: [PATCH] delete confusing CustomErrors attribute to make things more
 explicit

---
 internal/ingress/controller/config/config.go | 1 -
 internal/ingress/controller/nginx.go         | 1 -
 rootfs/etc/nginx/template/nginx.tmpl         | 3 +--
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
index 2b35e51eb..56b105cfa 100644
--- a/internal/ingress/controller/config/config.go
+++ b/internal/ingress/controller/config/config.go
@@ -721,7 +721,6 @@ type TemplateConfig struct {
 	TCPBackends                []ingress.L4Service
 	UDPBackends                []ingress.L4Service
 	HealthzURI                 string
-	CustomErrors               bool
 	Cfg                        Configuration
 	IsIPV6Enabled              bool
 	IsSSLPassthroughEnabled    bool
diff --git a/internal/ingress/controller/nginx.go b/internal/ingress/controller/nginx.go
index b134a2a55..34348f18d 100644
--- a/internal/ingress/controller/nginx.go
+++ b/internal/ingress/controller/nginx.go
@@ -596,7 +596,6 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
 		Servers:                    ingressCfg.Servers,
 		TCPBackends:                ingressCfg.TCPEndpoints,
 		UDPBackends:                ingressCfg.UDPEndpoints,
-		CustomErrors:               len(cfg.CustomHTTPErrors) > 0,
 		Cfg:                        cfg,
 		IsIPV6Enabled:              n.isIPV6Enabled && !cfg.DisableIpv6,
 		NginxStatusIpv4Whitelist:   cfg.NginxStatusIpv4Whitelist,
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
index ba5355c4d..56fd1c734 100644
--- a/rootfs/etc/nginx/template/nginx.tmpl
+++ b/rootfs/etc/nginx/template/nginx.tmpl
@@ -418,8 +418,7 @@ http {
 
     ssl_ecdh_curve {{ $cfg.SSLECDHCurve }};
 
-    {{ if .CustomErrors }}
-    # Custom error pages
+    {{ if gt (len $cfg.CustomHTTPErrors) 0 }}
     proxy_intercept_errors on;
     {{ end }}